From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- media-sound/mpd/Manifest | 7 +- media-sound/mpd/files/mpd-0.9.15-systemd.patch | 106 ---------- media-sound/mpd/metadata.xml | 1 - media-sound/mpd/mpd-0.19.19.ebuild | 256 ------------------------- media-sound/mpd/mpd-0.20.10.ebuild | 4 +- 5 files changed, 4 insertions(+), 370 deletions(-) delete mode 100644 media-sound/mpd/files/mpd-0.9.15-systemd.patch delete mode 100644 media-sound/mpd/mpd-0.19.19.ebuild (limited to 'media-sound/mpd') diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index a02e09f65978..5297f504faf4 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.4.init 690 BLAKE2B f7674cb5d20d307c63c3fd438a364c0bf660c63fafc21553ad5f6706ff038ee7f74786a586f58656bebdf3b79456f0bb14c137728c748380da5b8204b2958947 SHA512 d4c60d7b5b6e4067439be96aaa9d8d6f7bd7607ad42a618b04af94815cdbe900e06f11c6897f96cab623d6859d681feb11fa02f36fdce4841ed59c88ef86666f AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324 -AUX mpd-0.9.15-systemd.patch 3056 BLAKE2B 3198677bb60c248277dc0b1505aa7ce07663cb29379022fd3dcab2cb16252d90335d009c02e4d2973ed70225a9b4cbaadfea2816f54ab0101c07fbe905687ba6 SHA512 c9f8b909121f6f3b08ca4bf37ae744aa1468a306e8671681babac228aa5d4b528d094214e2596a862d0b685d01a448b6fd6b8170d6990e10f387f1e498c9dd3b AUX mpd.logrotate 199 BLAKE2B 5aa7be688734ae41f3b209e0efade9d517c0e6470dc49d46aa29a0d1a0205bde0ffff4bbb4ba53b3d29212ad50fe1fc8271344e6dd626871bec7f6d7764a52db SHA512 c55ef8f0e691ef0b358e5dc81a206328de4ccef449959fd7e6f9e95e07cbbee7446639278ebe6f4517063c9a6169e07bca0109958dc722a2caea1503693410ae AUX mpd2.init 727 BLAKE2B e6608d468be6fff5178558e549e28995169f171467bfd57c1821c3b479856633c2ba5c259013ec8d94bee9f9c61579dbbc9218091002825becabde74dca2e6cf SHA512 be2b52b3b69dcfb34e7753dce908c4f3c5b2d2e768c9177dbf06d72be487ccb2f2b58c292c0e19c5c6faf83bcabd1acb8fc6f1214b2de030b005b7759566892a -DIST mpd-0.19.19.tar.xz 707356 BLAKE2B bb9cade62cfbb64fd5f2db28e8c3ca1847efaf6b4ec818ceb935d5dff292afdbc0a59520f23e20c270bccd79e52e8e4bc9083535c438c1967dd14b0d56b995cf SHA512 949bfab2aa5dffb4089ce2023accc934648091d36768f8e4c75f62b4038e21db1e2ef3bb07a0f1cf6a91d0532cac8e7146be948d84dc4d7cdc5b252b7d815b64 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af -EBUILD mpd-0.19.19.ebuild 7648 BLAKE2B 26bd3442456b1bbfefd6a6c2d2f032682833aceb9603288e4a2b4566bc9b13edd21a96da3895ad472366f6cdb9764cf318c00d77186ff675c52989944ecbcfb2 SHA512 d9be4e7bd28c6bf7f872dc59c374d087e9d89474efd56d4809cdd5787d6cd45a9ad0670c04663915ca3620cd6f818f22710f08b849e00c6b3df441e443976b0a -EBUILD mpd-0.20.10.ebuild 7247 BLAKE2B 0baae4dc1c000e22f290f4fa148a07d2719d58323e22a139b4f22785e288f2765077dbfd7c9a7ab6a41b0bcf4248255423f510ab0b86612c7c9264ba56d4d17b SHA512 3ef60f912b800eaba381fd5ea8bef6e6a694dfc98c4e46543bce13ef10f7707b28925b044ee8a48b5fc9240ef4c5f8deb1b0b5f6f608fe8619a34e42c00586de +EBUILD mpd-0.20.10.ebuild 7246 BLAKE2B beb040eb0eca988c33fa5aef07022c3eeeda6afbc50d86ba8ee0f4d96137935ebf5abb3e094130de5cd83dec109527e06c3b95d2178f856a214896615debba48 SHA512 53d08548f75b6be0530c0ff6f0e4210e99020ff79f36515b1abbf4bf7c3db5e64bdf0c3a5396c5c89d07e37f23c28dc81d7e4a75bfeb17970e53d0892e84fe44 EBUILD mpd-0.20.12.ebuild 7314 BLAKE2B dde2d3d78b80234f8019a533ea57314336590b4fc6c6488a3c9fa411bbc0e92f3a89a99ac9b99113f68c281a24b3dc31713deaafb37c915fe4d47e3ca05510d0 SHA512 a7c94315bf5213daa24015c90ab01468403a2dae5018f56a6a33f8c6b09e6a0433a49336c1e29f1cfca4439f70c622465a5c9d3e367eeb1ad24bf965fd340a31 -MISC metadata.xml 2496 BLAKE2B d4e284d95b673e3e2ace7d681bcb577c1d3ef2d43f708de060ed6a595a478e82fccf3487587d1f71c7f1cbbd510c0bc698e0a78806968a1332f7174aceef6319 SHA512 712f6b0c5fc58250521ccebd68b5af708868a1f1b9c398eec3d24434206bd56da70c26dcab52793826fd82d456c0c608ff21558ab514faf329face07e0aae1cc +MISC metadata.xml 2449 BLAKE2B 33ffee8d5e8872a91eabb6006590828efe68da58117872aa4d36471cb7af858e00ec36e1193dd4ed08469b9522e9b953d7a5d0726890a8cf1333420c7ae9f2a2 SHA512 3092f8928c4dc74118306584f3766f78559672613336668c7e0dc8cffb0f46413d8d046b7fd54f6d69e8ac171e571666d8f5defac36d629bc0091e2550660e02 diff --git a/media-sound/mpd/files/mpd-0.9.15-systemd.patch b/media-sound/mpd/files/mpd-0.9.15-systemd.patch deleted file mode 100644 index cd03ebe16855..000000000000 --- a/media-sound/mpd/files/mpd-0.9.15-systemd.patch +++ /dev/null @@ -1,106 +0,0 @@ -Description: transition to libsystemd from deprecated libsystemd-daemon - systemd 209 merged the various libsystemd-* libraries into a single - libsystemd.so, so we check for that instead and rename the configure - option, define, etc accordingly. -Author: Florian Schlichting -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779762 -Forwarded: not-needed (solved in a less invasive and backward-compatible way upstream) - ---- a/configure.ac -+++ b/configure.ac -@@ -572,10 +572,10 @@ - MPD_DEPENDS([enable_sqlite], [enable_glib], - [Cannot use --enable-sqlite with --disable-glib]) - --AC_ARG_ENABLE(systemd-daemon, -- AS_HELP_STRING([--enable-systemd-daemon], -- [use the systemd daemon library (default=auto)]),, -- [enable_systemd_daemon=$linux_auto]) -+AC_ARG_ENABLE(systemd, -+ AS_HELP_STRING([--enable-systemd], -+ [use the systemd library (default=auto)]),, -+ [enable_systemd=$linux_auto]) - - AC_ARG_ENABLE(tcp, - AS_HELP_STRING([--disable-tcp], -@@ -762,11 +762,11 @@ - AC_MSG_ERROR([No client interfaces configured!]) - fi - --MPD_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon, -- [systemd activation], [libsystemd-daemon not found]) --AM_CONDITIONAL(ENABLE_SYSTEMD_DAEMON, test x$enable_systemd_daemon = xyes) --if test x$enable_systemd_daemon = xyes; then -- AC_DEFINE([ENABLE_SYSTEMD_DAEMON], 1, [Define to use the systemd daemon library]) -+MPD_AUTO_PKG(systemd, SYSTEMD, libsystemd, -+ [systemd activation], [libsystemd not found]) -+AM_CONDITIONAL(ENABLE_SYSTEMD, test x$enable_systemd = xyes) -+if test x$enable_systemd = xyes; then -+ AC_DEFINE([ENABLE_SYSTEMD], 1, [Define to use the systemd library]) - fi - - dnl --------------------------------------------------------------------------- ---- a/Makefile.am -+++ b/Makefile.am -@@ -58,7 +58,7 @@ - $(ICU_LDADD) \ - libutil.a \ - $(FS_LIBS) \ -- $(SYSTEMD_DAEMON_LIBS) \ -+ $(SYSTEMD_LIBS) \ - $(GLIB_LIBS) - - src_mpd_SOURCES = \ ---- a/config.h.in -+++ b/config.h.in -@@ -75,8 +75,8 @@ - /* Define to enable sqlite database support */ - #undef ENABLE_SQLITE - --/* Define to use the systemd daemon library */ --#undef ENABLE_SYSTEMD_DAEMON -+/* Define to use the systemd library */ -+#undef ENABLE_SYSTEMD - - /* Define to enable the TwoLAME encoder plugin */ - #undef ENABLE_TWOLAME_ENCODER ---- a/src/Listen.cxx -+++ b/src/Listen.cxx -@@ -32,7 +32,7 @@ - #include - #include - --#ifdef ENABLE_SYSTEMD_DAEMON -+#ifdef ENABLE_SYSTEMD - #include - #endif - -@@ -77,7 +77,7 @@ - } - } - --#ifdef ENABLE_SYSTEMD_DAEMON -+#ifdef ENABLE_SYSTEMD - - static bool - listen_systemd_activation(Error &error_r) -@@ -109,7 +109,7 @@ - - listen_socket = new ClientListener(loop, partition); - --#ifdef ENABLE_SYSTEMD_DAEMON -+#ifdef ENABLE_SYSTEMD - if (listen_systemd_activation(error)) - return true; - ---- a/doc/user.xml -+++ b/doc/user.xml -@@ -110,7 +110,7 @@ - libupnp-dev \ - libavahi-client-dev \ - libsqlite3-dev \ -- libsystemd-daemon-dev libwrap0-dev \ -+ libsystemd-dev libwrap0-dev \ - libcppunit-dev xmlto \ - libboost-dev \ - libglib2.0-dev libicu-dev diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml index 44d02733ce25..f2736f902a38 100644 --- a/media-sound/mpd/metadata.xml +++ b/media-sound/mpd/metadata.xml @@ -17,7 +17,6 @@ Use external faad library for AAC decoding Support writing audio to a FIFO Enables Fluidsynth MIDI software synthesis (discouraged) - Enable GLib usage Enables support for media-libs/game-music-emu for playing various video game music formats. Support for ID3 tags Use the Linux kernel inotify subsystem to notice changes to mpd music library diff --git a/media-sound/mpd/mpd-0.19.19.ebuild b/media-sound/mpd/mpd-0.19.19.ebuild deleted file mode 100644 index 2c72863763ad..000000000000 --- a/media-sound/mpd/mpd-0.19.19.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic linux-info multilib systemd user - -DESCRIPTION="The Music Player Daemon (mpd)" -HOMEPAGE="https://www.musicpd.org" -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 +glib 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" - -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} ) - ao? ( glib ) - gme? ( glib ) - jack? ( glib ) - network? ( || ( ${ENCODER_PLUGINS} ) - glib ) - recorder? ( || ( ${ENCODER_PLUGINS} ) ) - sid? ( glib ) - soundcloud? ( glib ) - sqlite? ( glib ) - opus? ( ogg ) - upnp? ( expat ) - vorbis? ( glib ) - wavpack? ( glib )" - -CDEPEND="!=media-libs/game-music-emu-0.6.0_pre20120802 ) - icu? ( dev-libs/icu:= ) - id3tag? ( media-libs/libid3tag ) - jack? ( media-sound/jack-audio-connection-kit ) - lame? ( network? ( media-sound/lame ) ) - libmpdclient? ( media-libs/libmpdclient ) - 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 ) ) ) - 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 ) - libsoxr? ( media-libs/soxr ) - 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} - selinux? ( sec-policy/selinux-mpd ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.18.conf.patch - "${FILESDIR}"/${PN}-0.9.15-systemd.patch # bug 584742 -) - -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 mpdconf="--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 - 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 samba || use upnp; then - mpdconf+=" --enable-neighbor-plugins" - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - econf \ - $(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) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_enable wildmidi) \ - $(use_enable zip zzip) \ - $(use_enable icu) \ - $(use_enable glib) \ - $(use_enable faad aac) \ - $(use_with zeroconf zeroconf avahi) \ - --with-systemdsystemunitdir=$(systemd_get_systemunitdir) \ - ${mpdconf} -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc - newins doc/mpdconf.dist mpd.conf - - newinitd "${FILESDIR}"/${PN}2.init ${PN} - - systemd_newuserunit systemd/${PN}.service ${PN}.service - sed -i '/WantedBy=/c WantedBy=default.target' \ - "${ED}"/usr/lib/systemd/user/mpd.service || die "sed failed" - - 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}.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.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild index 5d387eade22f..169aa5acc382 100644 --- a/media-sound/mpd/mpd-0.20.10.ebuild +++ b/media-sound/mpd/mpd-0.20.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # 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