5 files changed, 2 insertions, 81 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 28ed2c41fbe5..0139e7a8da31 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 634c1280858e..0e320844a38d 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -3,5 +3,5 @@ DIST abcMIDI-2022.08.23.zip 613318 BLAKE2B 42559bd1510f187bb245b12451bc20a6c5df3
 DIST abcMIDI-2022.09.01.zip 613296 BLAKE2B f91ae072768af52a4709146cefba1cb4af4a10d08ab1bb042d606672d666065a7a639771d7f2bc9b11af7dd898d230b160c19276ededc932b174f1fb717f3cd4 SHA512 45d52ccc90aed618649d18026f2142e0fb4665b97df4cbe20e9cb06ceb08769ab5d00a5bb2e60a9f0de6496cd5d222ea9f865d6c6cffc8efc626b994f8e0ed61
 EBUILD abcmidi-2022.08.01.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.08.23.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
-EBUILD abcmidi-2022.09.01.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.09.01.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.09.01.ebuild b/media-sound/abcmidi/abcmidi-2022.09.01.ebuild
index 11f547f4cb8e..3b11050a4f44 100644
--- a/media-sound/abcmidi/abcmidi-2022.09.01.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.09.01.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 7a5610e4c333..54151fd054ef 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,4 +1,3 @@
-AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 767 BLAKE2B 74879e5f52365f987ac53a8ee154f29b4d7f5287cb2a965b180b3ed4a17dcdc68acea5dbe0b3adc99869270fb93a3f68e6728fad0776b9ce500efb6206f4db3c SHA512 36f3246835d6476e8f4f26795f8148f46b04015141894cdf849bfdd04b1cf5aa7a3d5960587f00e2c7d0f71568ca20fee619b95415df4cd0e4978ce95ca5f897
 DIST mpd-0.22.11.tar.xz 737184 BLAKE2B b47dcbd1e01812b66c81f33a53fc0838ddb8b7a145763744d1cf1aacc7ca38e763b723498f3ab7360f49637bc80c0ada5a69c7d619f3cf167071a7bec2440d20 SHA512 c53d386d42c2360502aad5e7574ae5ff76a20df037696989f9e1700f9cffb88afdd329cce758067356c59308d0cbcf3ba3ccf6f013e2fcec54ddf08bd0212b43
diff --git a/media-sound/mpd/files/mpd-0.18.conf.patch b/media-sound/mpd/files/mpd-0.18.conf.patch
deleted file mode 100644
index d71056f7cd0d..000000000000
--- a/media-sound/mpd/files/mpd-0.18.conf.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/doc/mpdconf.dist b/doc/mpdconf.dist
-index 470a5c9..9f595a6 100644
---- a/doc/mpdconf.dist
-+++ b/doc/mpdconf.dist
-@@ -10,14 +10,14 @@
- # be disabled and audio files will only be accepted over ipc socket (using
- # file:// protocol) or streaming files over an accepted protocol.
- #
--#music_directory		"~/music"
-+music_directory			"/var/lib/mpd/music"
- #
- # This setting sets the MPD internal playlist directory. The purpose of this
- # directory is storage for playlists created by MPD. The server will use 
- # playlist files not created by the server but only if they are in the MPD
- # format. This setting defaults to playlist saving being disabled.
- #
--#playlist_directory		"~/.mpd/playlists"
-+playlist_directory		"/var/lib/mpd/playlists"
- #
- # This setting sets the location of the MPD database. This file is used to
- # load the database at server start up and store the database while the 
-@@ -25,7 +25,7 @@
- # MPD to accept files over ipc socket (using file:// protocol) or streaming
- # files over an accepted protocol.
- #
--#db_file			"~/.mpd/database"
-+db_file			"/var/lib/mpd/database"
- # 
- # These settings are the locations for the daemon log files for the daemon.
- # These logs are great for troubleshooting, depending on your log_level
-@@ -34,20 +34,20 @@
- # The special value "syslog" makes MPD use the local syslog daemon. This
- # setting defaults to logging to syslog, otherwise logging is disabled.
- #
--#log_file			"~/.mpd/log"
-+log_file			"/var/lib/mpd/log"
- #
- # This setting sets the location of the file which stores the process ID
--# for use of mpd --kill and some init scripts. This setting is disabled by
--# default and the pid file will not be stored.
-+# for use of mpd --kill and some init scripts. This setting is required when
-+# using the Gentoo init script.
- #
--#pid_file			"~/.mpd/pid"
-+pid_file			"/var/lib/mpd/pid"
- #
- # This setting sets the location of the file which contains information about
- # most variables to get MPD back into the same general shape it was in before
- # it was brought down. This setting is disabled by default and the server 
- # state will be reset on server start up.
- #
--#state_file			"~/.mpd/state"
-+state_file			"/var/lib/mpd/state"
- #
- # The location of the sticker database.  This is a database which
- # manages dynamic information attached to songs.
-@@ -64,7 +64,7 @@
- # initialization. This setting is disabled by default and MPD is run as the
- # current user.
- #
--#user				"nobody"
-+user				"mpd"
- #
- # This setting specifies the group that MPD will run as. If not specified
- # primary group of user specified with "user" setting will be used (if set).
-@@ -78,10 +78,10 @@
- # This setting can deny access to control of the daemon.
- #
- # For network
--#bind_to_address		"any"
-+bind_to_address		"localhost"
- #
- # And for Unix Socket
--#bind_to_address		"~/.mpd/socket"
-+bind_to_address		"/var/lib/mpd/socket"
- #
- # This setting is the TCP port that is desired for the daemon to get assigned
- # to.