Version bump, remove old

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

14 files changed, 25 insertions, 1184 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 914bcc6beec3..5b79f99138e3 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.300 2012/10/05 17:56:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.301 2012/10/06 20:50:20 angelos Exp $
+
+*mpd-0.17.2 (06 Oct 2012)
+
+  06 Oct 2012; Christoph Mende <angelos@gentoo.org> +mpd-0.17.2.ebuild,
+  -files/0.15.1-mpdconf.patch, -files/mpd-0.16.3-ffmpeg.patch,
+  -files/mpd-0.16.4-include-stdio.patch, -files/mpd-0.17-noise.patch,
+  -files/mpd.conf.patch, -files/mpd.rc, -mpd-0.16.2.ebuild, -mpd-0.16.5.ebuild,
+  -mpd-0.16.6.ebuild, -mpd-0.16.7.ebuild, -mpd-0.17-r1.ebuild, -mpd-0.17.ebuild:
+  Version bump, remove old
 
   05 Oct 2012; Brent Baude <ranger@gentoo.org> mpd-0.16.8.ebuild:
   Marking mpd-0.16.8 ppc64 for bug 426834
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 9b54ac5a64fe..824d76ee7a69 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,25 +1,20 @@
-AUX 0.15.1-mpdconf.patch 2912 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523 SHA512 cf7dd6ab37cd4492e41b78cec0feeb807f29951da1eda51600a42b2183797bbf440ef835c06bf3a1916f7aa2088ba5564ee8997b09bf7dc1cd5da507012b49ee WHIRLPOOL 98aa720ed334da8ce63f2743c0338909760aa272abe0c5b6492178fe04451cc9f191fae57cd27b6a3bdbeac4181b857eff5b3b6119b2e924dc73ebb232350a49
-AUX mpd-0.16.3-ffmpeg.patch 800 SHA256 b3958db44146f11bc1f99410284c30a2739915591e92704ed83ea389c222a121 SHA512 6b8b15c2a1effe698e701f7aa40c1d87ad720109666e04e49d231c8ea4abdf544cd99c51b4ae2fe714ed50658f4cb79377620cde15060079dd259b96174fe4bf WHIRLPOOL 632bde9d7485e759f6f46abe814312999b9a8cce8f22cd2b6098037efb71ff9170c4549c331b92750724fcf58b3d9b8a71468640b5f10e095750689a89a252fa
-AUX mpd-0.16.4-include-stdio.patch 269 SHA256 25816a9a87e06063e086bc93968aea2e312bb6e6618f1b789add960aaefffe63 SHA512 8edbfcdf02eb0b16b7b28d01989b9a5d2b720285f21398093094c00bafc6a4f00464b6e59e86567920bcb3676163348afd800e49a234933000871d86b6798696 WHIRLPOOL b441023f1717853c38582169291ba4240d9ecf33b6927cd350303efc3e5728b52c60708cd314178931e681968a4ac6cd477ddb93292e4f5d6b3ce8548a2ea3b3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mpd-0.16.conf.patch 2646 SHA256 5994735065e0e4a8b9b0fbb7ff8219088b7015c573a379dfeacecdfe55834653 SHA512 9a6cd76d0327d30063659084e72005c85c7a9541c93bacfec098bce93839040ec6da78da9bd4beb5dcb1625c7b0ac6d0cb3f42ca5e7313f0a05cd46286f0c9a1 WHIRLPOOL 06639909305319b818b8fa008bcaeb29b54b70403a4119d627b3d7eda56bdf3a9b246fb5f68bbabe1f52a65d78fb39058ce87f03aeb98f1fd34dec505f84e353
-AUX mpd-0.17-noise.patch 1249 SHA256 c8c66401d59161842d55efce5baea79108591005cf3414396e43a4beb611d2d8 SHA512 820dac36e24df3c88302cdef716c1d18612b3f0b975c30aea0b23b2b5d7431420c3f14f436e4e599c9ab7d8593f0883dc7b30199ea9faf19815ed22f87c5d3b3 WHIRLPOOL 7c084267036608e646f70b7a865458969ac1d84f9bd508ebe657d14c330376b39e7aef8d28b4cd421aee035f69f2e798176d1c09d74e451fccd6d65c5806f2cb
-AUX mpd.conf.patch 2566 SHA256 b73ec60d2766d86d78f9ba63d3e5973e8ffb3c1f412f450949bbd3e6dfcbf24f SHA512 8d5eed0c3fc4462ad9e942bac69e4323e6304004818011459706078814f42b17a270f0e409622a8b09e807417df03adf8bfb12e744bab744650a17ce976ef510 WHIRLPOOL d63c0433cafeaec8aa782838edcb98a5de46a516579cdeedc89c1f18d6480d4ad9a28de8c07c02c00164b7063cb6fb249182fa2945ed9938cd6021c8e0dc2ab8
 AUX mpd.init 824 SHA256 a6565c16ffd8ee69d63ead18c967e05abcab2eb64d9810c9f4711aef358cc048 SHA512 9b0565b328d3f9081a221c7459137f5ffd0a6d27f747738c3bfdac2c73d68374a296a135be94c8538af0bbe1f0472d3210437494a8ffb61f7a9ad15617ac0f78 WHIRLPOOL a91763b5d5da5a6aca93436a467e636f0fb21aa77cc9d857872a6182e66a5640c702a0175afd9bc811dda301f7acd81ab99727dea8dcf4acfb0ea70d8e49de7a
-AUX mpd.rc 672 SHA256 6b0c65dc4394108b3720afdc865f8692aa80c94ed12f351dce5f11537ffd84a8 SHA512 39199e1d4892c9b7bf05e6d829cc363e4a0e4c927e4846f4995206af409cded7dba5b557ab38dff2272580b14220e03f459aabe976dfa029ff506bd2bb3a1586 WHIRLPOOL 94261924e7b55608861b9ef777f1c9c129513d9f12cd2e9ff6711a77e33ceda02e8d4027f51421aeb9c11c81c644360bb2a5ad4e37c5dcd6e6e49786e0e3b46d
-DIST mpd-0.16.2.tar.bz2 478096 SHA256 59a3c191bbfcbbbc119f4b1e44bcb62ce15e45bc4d5041153408acc3074cb1d5 SHA512 21fc443eb3998cb3c8907f3dbdd8b4cf4eba00f4f388986fbddd776a81d62b84b6f58f76227f7a50c7b8ceec0181aa9419920e0e1614e8f2fdc6f230aba4a1f4 WHIRLPOOL ec93f753bb51a621805e01b776fff23128f7915c9a942618495112475ce5ff385fef09d21061bcbbda47c5165d6c036deb7e931bbf0b2e62e8ee9113e62c1290
-DIST mpd-0.16.5.tar.bz2 498034 SHA256 1a03ba9fd38230d79be5ee7d2b75ffeae01d738613866cdf23e74a1e1e9b73db SHA512 d43eddfa48190e2b2ff5e73d8a61263dfb6e72096dddbce7181522d91eaa61d1b4610326e33d1e107600cb934875269925940a5852d49ab6811844e343a7d946 WHIRLPOOL 2dd8e7a78de11cf0c7f47aa51004427f16645810f99d2590ef3109d76a302cb893c6c41dfb7e024209ed069669b7f24bc240567825665a49ab5df25682af4c76
-DIST mpd-0.16.6.tar.bz2 486442 SHA256 6ec5ad3fdeeb97608e40e041b6a458c61afd023a0fd1eeb464e208fcd36659df SHA512 a3b3727f1a09298bd78a27fb1b50110d609c4cc1b9f8674564918e03d28f71ba614e06e5df9dbb164c6cef3405eb7b35562799e047eef71e2499e1a1157c9fc2 WHIRLPOOL cfb720c84cadbbdc94075acc1efae3c4ca61bf2f91937a907b2718e007d4dd8a047fd2639190378b9cf6d519558221526ccfca30fd8af5986412834d8533544b
-DIST mpd-0.16.7.tar.bz2 487394 SHA256 47c10553389752c7fa072cf87c2bd30c552de75819fcf8286f3e7cc14ff0e32e SHA512 2d2d272426ca0e4f5ec95accac21e4dc0018ad4b22170f70674d96d72bbd969510f49e431064b42123db06eb1406273685b96be583c3ea0492b9e732d596f6f4 WHIRLPOOL c71ab947a1589368b1fbef245e5ec53a871aaed9d00d8c400c08d8ed77bae75b8dffc15f7a1c3fc454a13f1d3db99c498f740872d2aa6b38b211b4d57dfbd98a
 DIST mpd-0.16.8.tar.bz2 491170 SHA256 35183ae4a706391f5d739e4378b74f516952adda09a260fecfd531a58b0fff17 SHA512 ce6f0a004dec0e7269c1029c04c8d8f249ee5aeae362f60af6f617dc789e718a12b55d9efb928d7e332d6e9c8e960961b98174c57f5ff5a2f9f5b4999906a2c8 WHIRLPOOL 22713a7a684262c73ffde0ab063383dc84df6080de426b27712c8ac353f2f5d18ac69df918fb6bebd62dbd8da37361102573fdbd2fdfcf19ac4b22a4123a7e92
 DIST mpd-0.17.1.tar.bz2 546540 SHA256 b18cdb1b779ca2ab323e212a0af4a567b7da4881a4e96868a8979bdfdbe7c2e8 SHA512 f3fb6395b16c503d21f87eeadac7abe319d66cf4953c738c43c6f80b5b1c2db9c7bc9ef52051db814aada00d336255cf5fa67d11075edb38ba5fbe7122db4eb7 WHIRLPOOL 9ae3f129d5da734336d46a0f72179b60dcbcc53b3ab1cf4959d8a7dd1cac683bbf2959cd93fc1366b7eaf0c9888c018de730c0500cd16dd99eff4e6994dcecf3
-DIST mpd-0.17.tar.bz2 556624 SHA256 3151ad270530ec3408d65d884bcc776cd08f92040ee4aecb96e90b6145ad5867 SHA512 3a1aae5903070339037e6139b3be661d4a011151864b29511cfa4ec4856edd1d06f63c3857edd2942d7795362889df0e5776a91e4be8076812cc3f3a94dac6b5 WHIRLPOOL 5b9c5d84af40e7a8c75cf77d5d0e657940e7b554194a5b9ea168012f1609e0105ac486bf3800afaa2f39e63d3c021dbe5ba6d0e5b59df0272678b1d4a121b004
-EBUILD mpd-0.16.2.ebuild 5442 SHA256 849ad636d848c45f9fbaac3e48156f5f90e26cee5d26e469c2680c3825976d04 SHA512 8d03bdafc61f3416d875e9760bd88f0f82446ad009508a0a1532767707ab08ac69fd1a962770829f0c1c03959ba8288dccb1d7d8827b5330e045412985a8a131 WHIRLPOOL d9ceb92ca67c6b35daa5a98fd1597fa509efd9b4619d7e5f8bac4dfbb287e9843c3546ce1a6019c53d90e1667f54c9ac2aa584be586d60d36e6ec134cf70112c
-EBUILD mpd-0.16.5.ebuild 5442 SHA256 012955a9ff6456eea812ed2efc0e5d932b1d2b1fa6d85e7a3f3d8078ee419ab2 SHA512 1d757e4f51802ee4c1df2c31a6c44428c66c9b4c86ec31542209e580be58c3a34ecbd77389fd88eee34d0079dd77cb1798c17f5678111735ba7aad01e97e8f41 WHIRLPOOL 0e5b40c0dd263a61637dc495dd68b8512adc6a3c1e1f7891eaf0fe6ff2bd2fe6866ea9bac5698710657f41f02e12a721377da3511ab051ba5c7bfee027fa72d7
-EBUILD mpd-0.16.6.ebuild 5449 SHA256 26c2f7c8f15e2f2502b6e450ff5971dcef884ea8e102305e99f0a131fa1e0d80 SHA512 eb7de1bf34c20e3e9c374adfad572afe4c08863400314e23ae8e5e42b9c189ae5e95ec628b2ae43d6af427b0ed3390bd89d8a0eda4f80c5f79000afd9de9a415 WHIRLPOOL c64939f9456d05f618026f36fd2963dcd30a1f9cc6eff0c7d55077895a44ca68e303cb4f59793c4f4809a0ff00156b6c452e72cfca72334efcf7980218e8b113
-EBUILD mpd-0.16.7.ebuild 5487 SHA256 80bf24c785cc7048fe2e39fb27e9027dd8f4125581dbf3a1f95a32fa5a013661 SHA512 858e7dd37a8de3648e4cc2c0aa3c7aedf86c87d1c46db00dae6c90e3ce63ec3d5d0a92a129b9c71451d72e85b45da4d8a63001ed76fd7c0da621a5a35da1a8f8 WHIRLPOOL 3c46422f73d62e72bfdc999980ebe74094f7f6f3a2c2d55570190f91a4a21b9f9b032208c066964a6700aafa4bada334979c312db3d8b9d1371aad02c86bbb46
+DIST mpd-0.17.2.tar.bz2 548182 SHA256 48ff361a35df2751610e9716930e29235c1bd77224e57eb9ada1f04950668eb7 SHA512 9637b06b1b5d8311fc12eb0aa9a8d1bec96b7995329ab6fc0b8a6c7d6d0648cc931982e550f456648c9e08d29e33ab7f066b2bb9ad9c105e60a08cc8bf0ba599 WHIRLPOOL 0991ff7b094792d27d2d9865a985e5a0180042c1e28b2fb4ecc5553b909a4e3b1492fc869893277701ed9824703344faa12e9aaa681a3ded044e33680e83358c
 EBUILD mpd-0.16.8.ebuild 5527 SHA256 057bed13964b8cfddfb7ac8736fa97e9b823c9aa1e1d7cf5def5f94dfbb36f78 SHA512 f433c9bb10ca727693cf1ef55449d233352954704f3bc1f5d50db80bfee87e53eab522c340c64e33644b0aea680143f2a9fe22cd14410aacdad3e6d77b35f4fb WHIRLPOOL e9a4d264869a968693066115a2424b632644444d83c8444a605a8451369f882a06231c055f630dc2cf3c0ff1262d592405f7fc56b80b0ae6b69511413aacd455
-EBUILD mpd-0.17-r1.ebuild 5930 SHA256 cae62fa0a53f9fd823acd574a101a7b7b7c1773e152ff9bb31263c55658fdf3f SHA512 356fc8dbabf328f51043241cf6193357976d79cf6fe35275dadefc507fbd220d94ddd58cc618180390e9df195fd9ebf8cee69a6cc25b7da13e6c6a1c3ee0ebaf WHIRLPOOL 049aa8c410ecf9f8b5154390da75508047d796054d1f88c6edbc6d9282699d423e44f2f4de65fd4e36a50b737cec1ac0b703a92784db3cb76da363caf9840af2
 EBUILD mpd-0.17.1.ebuild 5898 SHA256 99b2eb683cd176f7cacd6fc8079d9ffe4272946a28dac4c839e46a90f621a059 SHA512 777778465aca403a5c1c52ce587434145dbe7b55cf01e974703eaecfbf7e9c6517a107838b9bedf493c58c45ea82161d5e67ecba1eff722c495d4ef5c1e9b9ee WHIRLPOOL b73373c6049ec609ce7d378121e20f83e67256d3ac67cd1bfe02d0be112ec0cd45e6b84b503e7aaa6a95ec19edb345764e190145733fbea197efda68c9fbb4af
-EBUILD mpd-0.17.ebuild 5828 SHA256 db103aea3fa1c0ef3bf04b6bd4a3589b672385d2e1e0688ddd712f054bb5370f SHA512 0ef809510820ba3c0974fb55032d469b7c8139894d036b4f940c50eab7f2f10e6eda5db78542276cd8111b95a0214a12a64d6fb6c5719ff99b99b7d6438f3eb9 WHIRLPOOL fbc75bb83df825ba1d28cb0b20b050c49e460853a90fba846bdbf9637e286a891dc4cae0fd1f56a2eb784a4a4604b900d7b7a1893e7d480e808f07f175c367e1
-MISC ChangeLog 43022 SHA256 f31849e7b4283a434a92e4fb4e7669e0efd6e5aef0c2333b1c246e6b088f5e1e SHA512 653e9d9434539883f422ff8ffa13d149c1381f98998f2eda23cd0bec2dc773f05f340c53707758ed46b66e18a7f9b3451137c320321eddeabccc9cb3759c6978 WHIRLPOOL ede4b2eab4edc538bc425f0e312bfd0847ae6286c5b72ec515cabd2146e24c79995ee9734391c8f576db58cbdde8ba1eed44e5eee12b84d37614b46eb99da377
+EBUILD mpd-0.17.2.ebuild 5898 SHA256 cba25fa07a647746a4374dadd1fadbad7d14c822e1b61199f8becd49cf3e3394 SHA512 eb6ef22bcfca9e9f5e054072fed893337b4993bab0df8bdd2818a221a5f36ab28801cc016feb2db8d4b6bb6caf8f96a116beb679ee4c9011e72db4f2f00687b2 WHIRLPOOL 24e4e45ebeaffea6a03d7dd4815b02ab5e83e9cc4e189de9a48a66a1e4d6a72a0e0ab364e508857a0b437f3fc1ff013fe74fba5389404c33e04e58e768bf9067
+MISC ChangeLog 43444 SHA256 5f2d61e18ccfa4cea3c4c5a892b946bddbc673a491cfed3e188eabab1f52dfcc SHA512 b8f8d861be4dcdab7feaf4642b5bbf2442e48ac94a067ecf2be41f7fe1f6879a9fcc016c43fdd2e31778a85c19b3529ab5bd40ddae1a4e09e504f9e9db931bc4 WHIRLPOOL 7f75dc1d8a11019867977d7c0b74fa14934c1f2617cd3382390e0982231c01fae52388e85ba9cde6fa94722c5c6ec467b3ea951246639c71a81f4983ce90a620
 MISC metadata.xml 1859 SHA256 ac0f784f218125bb433527a9646a10e2b54064707b81caaeac7bea9e17904bc3 SHA512 f69d851132ac7db4459b216b6dc7eee4e498833f9902e0995159a1253c2ef00159bb7d1bdd55bc4c18a0383887ecedbe3e0684d7d4a5a673bed927f58ba27c14 WHIRLPOOL 54ab0532189033132bd7d50ab77acd9be0b2fb731502dcb46130f90573d6466dff534dba48bb385cef1a8459006da59a8fdbb25c16a5be54014c06721bd55a0f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlBwmY0ACgkQmWq1bYTyC0PgkwD/XJpyF2419/SCmYt8ik1s9Waw
+LAbk9po0Ag8YxkSmY+oBAIpF4VwGujzCKaRAH89Pa5ivThD3F72r3XwmqcjvMAW3
+=OUEG
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/0.15.1-mpdconf.patch b/media-sound/mpd/files/0.15.1-mpdconf.patch
deleted file mode 100644
index 3a71af927e5c..000000000000
--- a/media-sound/mpd/files/0.15.1-mpdconf.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -ur mpd-0.15.1.orig/doc/mpdconf.example mpd-0.15.1/doc/mpdconf.example
---- mpd-0.15.1.orig/doc/mpdconf.example	2009-07-15 23:34:47.000000000 +0300
-+++ mpd-0.15.1/doc/mpdconf.example	2009-07-22 15:21:28.000000000 +0300
-@@ -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/log/mpd/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.
- #
--#pid_file			"~/.mpd/pid"
-+pid_file		"/var/run/mpd/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"
- #
- ###############################################################################
- 
-@@ -59,17 +59,17 @@
- # initialization. This setting is disabled by default and MPD is run as the
- # current user.
- #
--#user				"nobody"
-+user			"mpd"
- #
- # This setting sets the address for the daemon to listen on. Careful attention
- # should be paid if this is assigned to anything other then the default, any.
- # 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.
diff --git a/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch b/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch
deleted file mode 100644
index a945a0a6ab33..000000000000
--- a/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c
---- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c	2011-06-04 17:36:33.000000000 +0300
-+++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c	2011-06-24 18:18:51.840218251 +0300
-@@ -321,7 +321,7 @@
- 	}
- 
- 	//ffmpeg works with ours "fileops" helper
--	AVFormatContext *format_context;
-+	AVFormatContext *format_context = NULL;
- 	if (av_open_input_stream(&format_context, stream->io, input->uri,
- 				 input_format, NULL) != 0) {
- 		g_warning("Open failed\n");
-@@ -470,7 +470,7 @@
- 	if (stream == NULL)
- 		return NULL;
- 
--	AVFormatContext *f;
-+	AVFormatContext *f = NULL;
- 	if (av_open_input_stream(&f, stream->io, is->uri,
- 				 input_format, NULL) != 0) {
- 		mpd_ffmpeg_stream_close(stream);
diff --git a/media-sound/mpd/files/mpd-0.16.4-include-stdio.patch b/media-sound/mpd/files/mpd-0.16.4-include-stdio.patch
deleted file mode 100644
index df1cae801461..000000000000
--- a/media-sound/mpd/files/mpd-0.16.4-include-stdio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mpd-0.16.4/src/decoder/audiofile_decoder_plugin.c.orig
-+++ mpd-0.16.4/src/decoder/audiofile_decoder_plugin.c
-@@ -25,6 +25,7 @@
- #include <af_vfs.h>
- #include <assert.h>
- #include <glib.h>
-+#include <stdio.h>
- 
- #undef G_LOG_DOMAIN
- #define G_LOG_DOMAIN "audiofile"
diff --git a/media-sound/mpd/files/mpd-0.17-noise.patch b/media-sound/mpd/files/mpd-0.17-noise.patch
deleted file mode 100644
index ee19109d85de..000000000000
--- a/media-sound/mpd/files/mpd-0.17-noise.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From dbee2f199640ec296b049801fe79e35c4b3424f6 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max@duempel.org>
-Date: Mon, 09 Jul 2012 23:14:43 +0000
-Subject: output_init: put the "convert" filter at the end of the list
-
-No, really!  This fixes a regression of commit 74617389, which
-changed the order of filter plugins.
----
-diff --git a/src/output_init.c b/src/output_init.c
-index d2c86bf..c3b808e 100644
---- a/src/output_init.c
-+++ b/src/output_init.c
-@@ -213,13 +213,6 @@ ao_base_init(struct audio_output *ao,
- 	ao->replay_gain_filter = NULL;
- 	ao->other_replay_gain_filter = NULL;
- 
--	/* the "convert" filter must be the last one in the chain */
--
--	ao->convert_filter = filter_new(&convert_filter_plugin, NULL, NULL);
--	assert(ao->convert_filter != NULL);
--
--	filter_chain_append(ao->filter, ao->convert_filter);
--
- 	/* done */
- 
- 	return true;
-@@ -280,6 +273,13 @@ audio_output_setup(struct audio_output *ao, const struct config_param *param,
- 		return false;
- 	}
- 
-+	/* the "convert" filter must be the last one in the chain */
-+
-+	ao->convert_filter = filter_new(&convert_filter_plugin, NULL, NULL);
-+	assert(ao->convert_filter != NULL);
-+
-+	filter_chain_append(ao->filter, ao->convert_filter);
-+
- 	return true;
- }
- 
---
-cgit v0.9.0.3-66-g3205
diff --git a/media-sound/mpd/files/mpd.conf.patch b/media-sound/mpd/files/mpd.conf.patch
deleted file mode 100644
index d61d1218b90a..000000000000
--- a/media-sound/mpd/files/mpd.conf.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/doc/mpdconf.example b/doc/mpdconf.example
-index 11b14bd..6b24322 100644
---- a/doc/mpdconf.example
-+++ b/doc/mpdconf.example
-@@ -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,7 +34,7 @@
- # 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/log/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
-@@ -47,7 +47,7 @@
- # 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"
- #
- ###############################################################################
- 
-@@ -59,17 +59,17 @@
- # initialization. This setting is disabled by default and MPD is run as the
- # current user.
- #
--#user				"nobody"
-+user			"mpd"
- #
- # This setting sets the address for the daemon to listen on. Careful attention
- # should be paid if this is assigned to anything other then the default, any.
- # 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.
diff --git a/media-sound/mpd/files/mpd.rc b/media-sound/mpd/files/mpd.rc
deleted file mode 100755
index 0a78ff1f82e3..000000000000
--- a/media-sound/mpd/files/mpd.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.rc,v 1.5 2009/07/25 11:10:18 ssuominen Exp $
-
-depend() {
-	need localmount
-	use net.lo netmount nfsmount esound pulseaudio
-} 
-
-checkconfig() {
-	if ! [ -f /etc/mpd.conf ]; then
-		eerror "Configuration file /etc/mpd.conf does not exist."
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting Music Player Daemon" 
-	/usr/bin/mpd /etc/mpd.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Music Player Daemon"
-	/usr/bin/mpd --kill /etc/mpd.conf
-	sleep 0.1
-	eend $? 
-}
diff --git a/media-sound/mpd/mpd-0.16.2.ebuild b/media-sound/mpd/mpd-0.16.2.ebuild
deleted file mode 100644
index 6f62f42de6fa..000000000000
--- a/media-sound/mpd/mpd-0.16.2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.18 2012/06/01 03:11:53 zmedico Exp $
-
-EAPI=4
-inherit eutils flag-o-matic linux-info multilib user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate
-+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
-sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
-
-REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
-	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
-			ogg flac sid vorbis wavpack wildmidi )
-	network? ( || ( audiofile flac lame twolame vorbis ) )
-	lastfmradio? ( curl )"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	dev-libs/glib:2
-	aac? ( media-libs/faad2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio[-minimal] )
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	mms? ( media-libs/libmms )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplay:2 )
-	sndfile? ( media-libs/libsndfile )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
-}
-
-src_configure() {
-	local mpdconf="--enable-tcp --enable-un	--disable-documentation
-		--disable-ffado --disable-gme --enable-largefile
-		--disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	if use network; then
-		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output $(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)"
-	else
-		mpdconf+=" --disable-shout --disable-vorbis-encoder
-			--disable-httpd-output --disable-lame-encoder
-			--disable-twolame-encoder --disable-wave-encoder"
-	fi
-
-	if use flac && use ogg; then
-		mpdconf+=" --enable-oggflac"
-	else
-		mpdconf+=" --disable-oggflac"
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable bzip2) \
-		$(use_enable cdio iso9660) \
-		$(use_enable cue) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable ffmpeg) \
-		$(use_enable fifo) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable id3tag id3) \
-		$(use_enable inotify) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable lastfmradio lastfm) \
-		$(use_enable mms) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mad) \
-		$(use_enable mikmod) \
-		$(use_enable modplug) \
-		$(use_enable mpg123) \
-		$(use_enable musepack mpc) \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable pipe pipe-output) \
-		$(use_enable profile gprof) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sid sidplay) \
-		$(use_enable sndfile sndfile) \
-		$(use_enable sqlite) \
-		$(use_enable tcpd libwrap) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wildmidi) \
-		$(use_enable zip zzip) \
-		$(use_with zeroconf zeroconf avahi) \
-		${mpdconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/mpd.init mpd
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${D}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-	elog "sure that MPD's pid_file is unset."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.16.5.ebuild b/media-sound/mpd/mpd-0.16.5.ebuild
deleted file mode 100644
index 2cdd67d97387..000000000000
--- a/media-sound/mpd/mpd-0.16.5.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.5.ebuild,v 1.11 2012/06/01 03:11:53 zmedico Exp $
-
-EAPI=4
-inherit eutils flag-o-matic linux-info multilib user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate
-+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
-sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
-
-REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
-	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
-			ogg flac sid vorbis wavpack wildmidi )
-	network? ( || ( audiofile flac lame twolame vorbis ) )
-	lastfmradio? ( curl )"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	dev-libs/glib:2
-	aac? ( media-libs/faad2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio[-minimal] )
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	mms? ( media-libs/libmms )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplay:2 )
-	sndfile? ( media-libs/libsndfile )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
-}
-
-src_configure() {
-	local mpdconf="--enable-tcp --enable-un	--disable-documentation
-		--disable-ffado --disable-gme --enable-largefile
-		--disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	if use network; then
-		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output $(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)"
-	else
-		mpdconf+=" --disable-shout --disable-vorbis-encoder
-			--disable-httpd-output --disable-lame-encoder
-			--disable-twolame-encoder --disable-wave-encoder"
-	fi
-
-	if use flac && use ogg; then
-		mpdconf+=" --enable-oggflac"
-	else
-		mpdconf+=" --disable-oggflac"
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable bzip2) \
-		$(use_enable cdio iso9660) \
-		$(use_enable cue) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable ffmpeg) \
-		$(use_enable fifo) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable id3tag id3) \
-		$(use_enable inotify) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable lastfmradio lastfm) \
-		$(use_enable mms) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mad) \
-		$(use_enable mikmod) \
-		$(use_enable modplug) \
-		$(use_enable mpg123) \
-		$(use_enable musepack mpc) \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable pipe pipe-output) \
-		$(use_enable profile gprof) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sid sidplay) \
-		$(use_enable sndfile sndfile) \
-		$(use_enable sqlite) \
-		$(use_enable tcpd libwrap) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wildmidi) \
-		$(use_enable zip zzip) \
-		$(use_with zeroconf zeroconf avahi) \
-		${mpdconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/mpd.init mpd
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${D}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-	elog "sure that MPD's pid_file is unset."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.16.6.ebuild b/media-sound/mpd/mpd-0.16.6.ebuild
deleted file mode 100644
index 5c1f4c54a7fe..000000000000
--- a/media-sound/mpd/mpd-0.16.6.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.6.ebuild,v 1.5 2012/06/01 03:11:53 zmedico Exp $
-
-EAPI=4
-inherit eutils flag-o-matic linux-info multilib user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate
-+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
-sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
-
-REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
-	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
-			ogg flac sid vorbis wavpack wildmidi )
-	network? ( || ( audiofile flac lame twolame vorbis ) )
-	lastfmradio? ( curl )"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	dev-libs/glib:2
-	aac? ( media-libs/faad2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio[-minimal] )
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	mms? ( media-libs/libmms )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplay:2 )
-	sndfile? ( media-libs/libsndfile )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
-}
-
-src_configure() {
-	local mpdconf="--enable-tcp --enable-un	--disable-documentation
-		--disable-ffado --disable-gme --enable-largefile
-		--disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	if use network; then
-		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output $(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)"
-	else
-		mpdconf+=" --disable-shout --disable-vorbis-encoder
-			--disable-httpd-output --disable-lame-encoder
-			--disable-twolame-encoder --disable-wave-encoder"
-	fi
-
-	if use flac && use ogg; then
-		mpdconf+=" --enable-oggflac"
-	else
-		mpdconf+=" --disable-oggflac"
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable bzip2) \
-		$(use_enable cdio iso9660) \
-		$(use_enable cue) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable ffmpeg) \
-		$(use_enable fifo) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable id3tag id3) \
-		$(use_enable inotify) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable lastfmradio lastfm) \
-		$(use_enable mms) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mad) \
-		$(use_enable mikmod) \
-		$(use_enable modplug) \
-		$(use_enable mpg123) \
-		$(use_enable musepack mpc) \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable pipe pipe-output) \
-		$(use_enable profile gprof) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sid sidplay) \
-		$(use_enable sndfile sndfile) \
-		$(use_enable sqlite) \
-		$(use_enable tcpd libwrap) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wildmidi) \
-		$(use_enable zip zzip) \
-		$(use_with zeroconf zeroconf avahi) \
-		${mpdconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/mpd.init mpd
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${D}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-	elog "sure that MPD's pid_file is unset."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.16.7.ebuild b/media-sound/mpd/mpd-0.16.7.ebuild
deleted file mode 100644
index 8b3bb4143f53..000000000000
--- a/media-sound/mpd/mpd-0.16.7.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.7.ebuild,v 1.5 2012/06/01 03:11:53 zmedico Exp $
-
-EAPI=4
-inherit eutils flag-o-matic linux-info multilib systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate
-+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
-sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
-
-REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
-	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
-			ogg flac sid vorbis wavpack wildmidi )
-	network? ( || ( audiofile flac lame twolame vorbis ) )
-	lastfmradio? ( curl )"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	dev-libs/glib:2
-	aac? ( media-libs/faad2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio[-minimal] )
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	mms? ( media-libs/libmms )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplay:2 )
-	sndfile? ( media-libs/libsndfile )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
-}
-
-src_configure() {
-	local mpdconf="--enable-tcp --enable-un	--disable-documentation
-		--disable-ffado --disable-gme --enable-largefile
-		--disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	if use network; then
-		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output $(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)"
-	else
-		mpdconf+=" --disable-shout --disable-vorbis-encoder
-			--disable-httpd-output --disable-lame-encoder
-			--disable-twolame-encoder --disable-wave-encoder"
-	fi
-
-	if use flac && use ogg; then
-		mpdconf+=" --enable-oggflac"
-	else
-		mpdconf+=" --disable-oggflac"
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable bzip2) \
-		$(use_enable cdio iso9660) \
-		$(use_enable cue) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable ffmpeg) \
-		$(use_enable fifo) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable id3tag id3) \
-		$(use_enable inotify) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable lastfmradio lastfm) \
-		$(use_enable mms) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mad) \
-		$(use_enable mikmod) \
-		$(use_enable modplug) \
-		$(use_enable mpg123) \
-		$(use_enable musepack mpc) \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable pipe pipe-output) \
-		$(use_enable profile gprof) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable sid sidplay) \
-		$(use_enable sndfile sndfile) \
-		$(use_enable sqlite) \
-		$(use_enable tcpd libwrap) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wildmidi) \
-		$(use_enable zip zzip) \
-		$(use_with zeroconf zeroconf avahi) \
-		"$(systemd_with_unitdir)" \
-		${mpdconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/mpd.init mpd
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${D}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-	elog "sure that MPD's pid_file is unset."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.17-r1.ebuild b/media-sound/mpd/mpd-0.17.2.ebuild
index f45f9f0c27a5..3ecc884ff6c5 100644
--- a/media-sound/mpd/mpd-0.17-r1.ebuild
+++ b/media-sound/mpd/mpd-0.17.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17-r1.ebuild,v 1.4 2012/08/04 15:16:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.2.ebuild,v 1.1 2012/10/06 20:50:20 angelos Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib systemd user
@@ -89,8 +89,7 @@ pkg_setup() {
 
 src_prepare() {
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
-		"${FILESDIR}"/${P}-noise.patch
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
 }
 
 src_configure() {
diff --git a/media-sound/mpd/mpd-0.17.ebuild b/media-sound/mpd/mpd-0.17.ebuild
deleted file mode 100644
index aaee3d69de14..000000000000
--- a/media-sound/mpd/mpd-0.17.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.ebuild,v 1.5 2012/07/29 18:31:47 armin76 Exp $
-
-EAPI=4
-inherit eutils flag-o-matic linux-info multilib systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
-IUSE="aac +alsa ao audiofile bzip2 cdio +curl debug +fifo +ffmpeg flac
-fluidsynth +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad
-mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder
-sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack
-wildmidi zeroconf zip"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-INPUT_PLUGINS="aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123
-	musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${INPUT_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	lastfmradio? ( curl )"
-
-RDEPEND="!<sys-cluster/mpich2-1.4_rc2
-	dev-libs/glib:2
-	aac? ( media-libs/faad2 )
-	alsa? ( media-sound/alsa-utils
-		media-libs/alsa-lib )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio[-minimal] )
-	curl? ( net-misc/curl )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( network? ( media-sound/lame ) )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( >=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	pulseaudio? ( media-sound/pulseaudio )
-	sid? ( media-libs/libsidplay:2 )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2 )
-	soup? ( net-libs/libsoup:2.4 )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use inotify; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
-}
-
-src_configure() {
-	local mpdconf="--disable-despotify --disable-documentation --disable-ffado
-		--disable-gme --disable-mvp --disable-roar --enable-largefile
-		--enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	if use network; then
-		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output $(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)"
-	else
-		mpdconf+=" --disable-shout --disable-vorbis-encoder
-			--disable-httpd-output --disable-lame-encoder
-			--disable-twolame-encoder --disable-wave-encoder"
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable bzip2) \
-		$(use_enable cdio cdio-paranoia) \
-		$(use_enable cdio iso9660) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable ffmpeg) \
-		$(use_enable fifo) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable id3tag id3) \
-		$(use_enable inotify) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable lastfmradio lastfm) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mad) \
-		$(use_enable mikmod) \
-		$(use_enable mms) \
-		$(use_enable modplug) \
-		$(use_enable mpg123) \
-		$(use_enable musepack mpc) \
-		$(use_enable openal) \
-		$(use_enable oss) \
-		$(use_enable pipe pipe-output) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable recorder recorder-output) \
-		$(use_enable sid sidplay) \
-		$(use_enable sndfile sndfile) \
-		$(use_enable soundcloud) \
-		$(use_enable soup) \
-		$(use_enable sqlite) \
-		$(use_enable systemd systemd-daemon) \
-		$(use_enable tcpd libwrap) \
-		$(use_enable vorbis) \
-		$(use_enable wavpack) \
-		$(use_enable wildmidi) \
-		$(use_enable zip zzip) \
-		$(use_with zeroconf zeroconf avahi) \
-		"$(systemd_with_unitdir)" \
-		${mpdconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/mpd.init mpd
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-	elog "sure that MPD's pid_file is unset."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}