Add systemd USE flag, fix typo (noar -> roar)

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

4 files changed, 23 insertions, 16 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 1648fdbd4249..859570c387e0 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.287 2012/07/11 09:55:18 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.288 2012/07/11 20:07:18 angelos Exp $
+
+  11 Jul 2012; Christoph Mende <angelos@gentoo.org> metadata.xml,
+  mpd-0.17.ebuild:
+  Add systemd USE flag, fix typo (noar -> roar)
 
   11 Jul 2012; Christoph Mende <angelos@gentoo.org> metadata.xml,
   mpd-0.17.ebuild:
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 346bd6cb7721..819f2c533739 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -19,13 +19,13 @@ EBUILD mpd-0.16.5.ebuild 5442 SHA256 012955a9ff6456eea812ed2efc0e5d932b1d2b1fa6d
 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
 EBUILD mpd-0.16.8.ebuild 5535 SHA256 cdb8d01c07217fff203ca132cbde1b30d2d32438068493511391807fbc0d42db SHA512 940a24626c0e21a35429c6af42dad84831f6aedf9fe88031296d4fee44219441e0249d61195f7e4d11056dd7f00cc270c15ec92542ea0b4d097caecb1d379480 WHIRLPOOL 9161b7cd211c0bf8c3f7131b5cf6f4574064fec3b8085d4a23ffd8fe5acc8d66c93834e82029680dc0ad4e54da15fc334361168d7ffeca148d51e45c4d68f610
-EBUILD mpd-0.17.ebuild 5741 SHA256 ed6e7c055dc0c9b065e497f13284ecf812f1b6116c84447923cbcd748890b7fb SHA512 89ac8d27f811162e5dd9356fe135c23d93f9e3c2ae39569c995cfa7c8e1d2aeb169bae53ef4ad19beb6caaf4ed3a6a25f8170876da69b7cdf77921f6eec40b8b WHIRLPOOL adbbf12a672ae0f88626eaf55f4c4dd838426e09daa8a4beb3ab3b0ba818e52c2379cfa38fe95ed4d394036f37c9bb68b1560e77f0d8ca18385d5a292251e3c6
-MISC ChangeLog 41471 SHA256 3153cba8254b59250e40f2d45d7eae639a4f93e8738ad98e8e96ad4adf075a3b SHA512 9fb8a50ff537d76b535c5a46e3cae9881db6546f9ad33e4ac82654d65bcae2ebbf51309f9eaa39c96377ac90a3e320aa761c8504561ba543c3893309f8edc854 WHIRLPOOL 076f0b7bf0b9c3e738d79b393cded1a07187511a0178ff818687c1291e16003e30eb99e135caa87d4fc89f6048b0c9063ce2c73f7c74122da8275ac2a72e9214
-MISC metadata.xml 1657 SHA256 55d6274dff614be7b6a18029b009fade10667bb0fab0574288618a623d79bec6 SHA512 490692a149fbdb05c7f11f0b51459fdbf8e6abb908e90bca6e849d9892d5dfe8a2fed8d4cdeb1d0e2d67cafde5c630eea65167a48627b941e4586fba0034a4b0 WHIRLPOOL 3ff4a936714220d6cd9d8a87ec3350f9062e60e91194139fff19281b59484190b558a11c78849d79cfd7d3e3ed59f7a246d7e6d3b62625759ca456be03588b94
+EBUILD mpd-0.17.ebuild 5821 SHA256 77157be786cdbb7b64a814b8c8c4c70264031e5ab25857dac60530fc0e71332f SHA512 9b1dee1fb17fe5728a2cb13387f1248ae78e9c00259705bffc723b5f7081f7c6dfaa7f2fcd14dd263a5e1be16c99b6fde909fce645db32dc860c7701b8e72549 WHIRLPOOL 17ae15421f193f5b0afeb05c39e4f0360799ededc77d208131395af938ef2c20989e4c3d4ab49ab78a4e38a1f3463b93fe70020b1a78335ed53c67a0040ee360
+MISC ChangeLog 41605 SHA256 fb0d6d2b08f87f68f012fce00d4bb650c2835f53d055cff9c7f7f70d01139a49 SHA512 12bd3254a5484c14f8bd26456b88417b82a683c6ce4a937d320fb66f71f3be0dcdd9194f1c728b1e51bc5d541fad8aa5c32ca4388ff0ef81c561d01349713301 WHIRLPOOL 786fd0ce58f2c37489c389fd05f28e76f843e4068be2215e1b2600135cc386b2102904308951e3304754bd131d4ce9153c8f20d4fe38011847e2e4d5325cb975
+MISC metadata.xml 1731 SHA256 368a8e2a0f1c3a84595d86ecb204e26060e6c155102183b392de207ef9d0ec98 SHA512 445ba29b6a69e1960251a0b1eccc02bdf749e3d4cbd29687ee6a0b7c933166a7bd31a692b9ccf9443a6d310e9dbf8efc71403ce7f909cadbcf2fccb77f8daf12 WHIRLPOOL b1be89a9d4f811254180a44d5e7aa4768e288c2903b593b2dd3aeccb4d0c025091bf8d606d8acbf3c40d4fd1b41104c2bd152fc924f00775761d85c9c26baecb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/9TX8ACgkQmWq1bYTyC0NjtQD/bpKRMGpwofuarLrQrkfyiWnV
-f9RYVZxVUvreVuRmnJAA/j+qLaFqT1QIZRy/6HrkP1GmGE7WMCkJeVpPwW4hsfyP
-=uoWs
+iF4EAREIAAYFAk/93O8ACgkQmWq1bYTyC0MnqgD/cKlL8Yu6al1mKXew4LiaW8Tr
+RHq4qPaEpVSOVAm25kQA/RWc67GqQsAEYntlijKnUOGNN0KdXt4xJpVC3hu1qP3t
+=Q27m
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 2ec659485f81..d5f1ec54faa1 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -20,15 +20,16 @@
 	<flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
 	<flag name="lame">Support for MP3 streaming via Icecast2</flag>
 	<flag name="lastfmradio">Support listening to last.fm radio stations</flag>
-	<flag name="twolame">Support twolame MPEG-2 encoding</flag>
-    <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
 	<flag name="network">Enables network streaming support</flag>
 	<flag name="pipe">Support writing audio to a pipe</flag>
 	<flag name="recorder">Enables output plugin for recording radio streams</flag>
 	<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 	<flag name="soundcloud">Build plugin to access soundcloud</flag>
 	<flag name="soup">Use <pkg>net-libs/libsoup</pkg> for HTTP streaming</flag>
+	<flag name="systemd">Enable support for systemd socket activation</flag>
+	<flag name="twolame">Support twolame MPEG-2 encoding</flag>
 	<flag name="wildmidi">Enable MIDI support via wildmidi</flag>
 	<flag name="zip">Support for ZIP files</flag>
+    <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/mpd/mpd-0.17.ebuild b/media-sound/mpd/mpd-0.17.ebuild
index 99c028ad0787..2734c097d07e 100644
--- a/media-sound/mpd/mpd-0.17.ebuild
+++ b/media-sound/mpd/mpd-0.17.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.ebuild,v 1.3 2012/07/11 09:55:18 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.ebuild,v 1.4 2012/07/11 20:07:18 angelos Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib systemd user
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~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 tcpd twolame unicode vorbis wavpack wildmidi
-zeroconf zip"
+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
@@ -42,18 +42,18 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	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 )
+	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 )
@@ -62,6 +62,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	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 )
@@ -92,7 +93,7 @@ src_prepare() {
 
 src_configure() {
 	local mpdconf="--disable-despotify --disable-documentation --disable-ffado
-		--disable-gme --disable-mvp --disable-noar --enable-largefile
+		--disable-gme --disable-mvp --disable-roar --enable-largefile
 		--enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}"
 
 	if use network; then
@@ -145,6 +146,7 @@ src_configure() {
 		$(use_enable soundcloud) \
 		$(use_enable soup) \
 		$(use_enable sqlite) \
+		$(use_enable systemd systemd-daemon) \
 		$(use_enable tcpd libwrap) \
 		$(use_enable vorbis) \
 		$(use_enable wavpack) \