From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 22 Oct 2018 11:09:47 +0100
Subject: gentoo resync : 22.10.2018

---
 media-sound/mpd/Manifest                    |   7 +-
 media-sound/mpd/files/mpd-0.20.12.logrotate |   6 -
 media-sound/mpd/metadata.xml                |   2 -
 media-sound/mpd/mpd-0.20.12-r2.ebuild       | 271 ----------------------------
 media-sound/mpd/mpd-0.20.21-r1.ebuild       |   4 +-
 5 files changed, 4 insertions(+), 286 deletions(-)
 delete mode 100644 media-sound/mpd/files/mpd-0.20.12.logrotate
 delete mode 100644 media-sound/mpd/mpd-0.20.12-r2.ebuild

(limited to 'media-sound/mpd')

diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 7acd6cd777c6..d57def02c9a2 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,13 +1,10 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.20.10-libcdio-2.patch 843 BLAKE2B d0c7eeeedb6065b1e08b1a8b1e6f5237408cd1b747aba72651441f0c203a4d32a39bf4e3c2371ae16fbde2f991c2f60870b15e8340b81bbc793355131ea57f62 SHA512 c9b62e6e0e7408ff3ab1e73c08001e498150c6bda8a9796ef23c35ba4dd0313e243129f7fb1760997f4a226f1ea3de56657eeead41f07bcaafa9affde40cc851
-AUX mpd-0.20.12.logrotate 88 BLAKE2B 2ff692c0c37da35ba3d53c2050653131a0de364094a779eba7ed7b2db3334f1eef7fa261b6a94416cd6a29290fb563a4a15ef70768c2860d2d9c3b7f9fdfbc4d SHA512 6c0ad8341f24633271972a2414e945a8eb14db31b114e1c260bcc0c50e1288bdbc5e3344ff9ef53c3c28d7368985e55a944d53705302b8a3d14eccc9fe2d6b48
 AUX mpd-0.20.21.logrotate 112 BLAKE2B 2fd60db81c39d3b7eb1cd375450b5902d6e31734e3801819dbc9475d84750491780aab6c4db0be00039c88dce2fb25b83abc9374a0c736697d8c1cc1bd4f5b24 SHA512 32da561c59f8641e549ccec6ecf8a678cd1b9c1d7fbbef5ca6a1b1eb0f07948c2ea23366d357a16a221e0a9b96fe079df3a046f18c4410b8ddc4adce63c6d467
 AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
 AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
-DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 EBUILD mpd-0.20.10.ebuild 7285 BLAKE2B 08b8d0afe72f0ad186438441aa1229e71c1c2564250c9e624eac2f7c6ec7596bd9f0ad4b353b4ca37af9acac2bda7b2a59f134265cb9a41be0bdfef64cf384b8 SHA512 82c6c20fbe05137a61ed07daa9bdcd0e7639267d8301e14257978d13e67a6ec9e0581f873c22df14a90a1dffb71dfd47fc456aee49889dc5d67a566ea6326ba4
-EBUILD mpd-0.20.12-r2.ebuild 7361 BLAKE2B 6c257159de263c22984a28331cf6ad9bf17ab34bc6e255901f2871588133f2ddcc99cabe142f14a75e831faaad9cf2588889286cb6183716d9a14bd4e4f74624 SHA512 c5d52149a1ac383c35fdf5f22c756459545f1f0ca630d0ba3a433e6f856c9ad49482e3a39e94abc025c2e094abe2e260e8716fbda78e1ff8280a92957e720a36
-EBUILD mpd-0.20.21-r1.ebuild 7314 BLAKE2B 35d022e4d5a85a88a1bfd944e3b43e9e2117630139bb8b5347fdcdb967be6c1c3a8047d39be64ccb40144a11b1d6bcd9a83bc95d184cfc6cdea30d5050b6d7bc SHA512 1de5b6fda9bc017dd01bda1f8076987416cca0220c6922ff0778125b5585b73a22ffeb04f42d562c4c2561f6fdcb42287fb0665a5aa13498a93baa809dcd7aa6
-MISC metadata.xml 2517 BLAKE2B 1723729d1962eb361c8231e9351164008b3f2e47097846afc6a06d2ae8157a6ef0643f1ddc53f0fd7ca5569eaf1f30ad28ec18079ec2a9f92cf0ad3b287f4798 SHA512 f829d7424245ff87e86d1bdd4c59cd4a102823b8796aa44d202f2b0afdf902f88fa43d478b9cf610c1ffb52595d3bc2d37bc4d67ddd440110009ff9cbcfaad46
+EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
+MISC metadata.xml 2412 BLAKE2B b208c2d3481421794b7fd5328814e9dd340eb820df4972c0bd70626d9d63707dfceb8f7446239a3ca581f46004a1aa5e6438cbb6449700f472c1aa411d848649 SHA512 4cbaa880020239d2fcf6e2f057004569eb86288d3f25dce8e89eddc8d65cbbccf01dd0cfbfc376790297a1147d18aec3148515659fae5aec3bbe215bb94c2f8d
diff --git a/media-sound/mpd/files/mpd-0.20.12.logrotate b/media-sound/mpd/files/mpd-0.20.12.logrotate
deleted file mode 100644
index 738313e9e310..000000000000
--- a/media-sound/mpd/files/mpd-0.20.12.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/lib/mpd/log {
-	missingok
-	postrotate
-		/etc/init.d/mpd --quiet reload
-	endscript
-}
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 422ce7b850ea..d6162fb2c8ad 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -26,7 +26,6 @@
     <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
     <flag name="network">Enables network streaming support</flag>
     <flag name="nfs">Enable support for the Network File System</flag>
-    <flag name="opus">Enable Opus codec 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>
@@ -36,7 +35,6 @@
     <flag name="twolame">Support twolame MPEG-2 encoding</flag>
     <flag name="webdav">Enable using music from a WebDAV share</flag>
     <flag name="wildmidi">Enable MIDI support via wildmidi</flag>
-    <flag name="zip">Support for ZIP files</flag>
   </use>
   <upstream>
     <remote-id type="github">MusicPlayerDaemon/MPD</remote-id>
diff --git a/media-sound/mpd/mpd-0.20.12-r2.ebuild b/media-sound/mpd/mpd-0.20.12-r2.ebuild
deleted file mode 100644
index 78b954370d78..000000000000
--- a/media-sound/mpd/mpd-0.20.12-r2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad 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} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	opus? ( ogg )
-	upnp? ( expat )
-	webdav? ( curl expat )
-"
-
-CDEPEND="
-	adplug? ( media-libs/adplug )
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? ( dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	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 ) )
-	)
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-4.0.25 )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp:= )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<sys-cluster/mpich2-1.4_rc2
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-	"${FILESDIR}"/${PN}-0.20.10-libcdio-2.patch
-)
-
-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 eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-		sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	if use network; then
-		myeconfargs+=(
-			--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
-		myeconfargs+=(
-			--disable-shout
-			--disable-vorbis-encoder
-			--disable-httpd-output
-			--disable-lame-encoder
-			--disable-twolame-encoder
-			--disable-wave-encoder
-		)
-	fi
-
-	if use samba || use upnp; then
-		myeconfargs+=( --enable-neighbor-plugins )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	myeconfargs+=(
-		$(use_enable eventfd)
-		$(use_enable signalfd)
-		$(use_enable libmpdclient)
-		$(use_enable expat)
-		$(use_enable upnp)
-		$(use_enable adplug)
-		$(use_enable alsa)
-		$(use_enable ao)
-		$(use_enable audiofile)
-		$(use_enable zlib)
-		$(use_enable bzip2)
-		$(use_enable cdio cdio-paranoia)
-		$(use_enable curl)
-		$(use_enable samba smbclient)
-		$(use_enable nfs)
-		$(use_enable debug)
-		$(use_enable ffmpeg)
-		$(use_enable fifo)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable gme)
-		$(use_enable id3tag id3)
-		$(use_enable inotify)
-		$(use_enable ipv6)
-		$(use_enable cdio iso9660)
-		$(use_enable jack)
-		$(use_enable soundcloud)
-		$(use_enable tcpd libwrap)
-		$(use_enable libsamplerate lsr)
-		$(use_enable libsoxr soxr)
-		$(use_enable mad)
-		$(use_enable mikmod)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable musepack mpc)
-		$(use_enable mpg123)
-		$(use_enable openal)
-		$(use_enable opus)
-		$(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 sqlite)
-		$(use_enable systemd systemd_daemon)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_enable wildmidi)
-		$(use_enable zip zzip)
-		$(use_enable icu)
-		$(use_enable webdav)
-		$(use_enable faad aac)
-		$(use_with zeroconf zeroconf avahi)
-		--with-boost="${EPREFIX}"/usr
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.20.12.logrotate ${PN}
-
-	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() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.20.21-r1.ebuild b/media-sound/mpd/mpd-0.20.21-r1.ebuild
index c41cc0ebed29..a4f1962c0a1b 100644
--- a/media-sound/mpd/mpd-0.20.21-r1.ebuild
+++ b/media-sound/mpd/mpd-0.20.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
 	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
 	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-- 
cgit v1.2.3