[gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/files/, media-sound/mpd/

[Andreas Sturmlechner]

commit:     1eb1c064c5f8eb8d4d299b8e4d43f59152787595
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  4 16:45:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  4 17:38:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb1c064

media-sound/mpd: Drop old

Closes: https://bugs.gentoo.org/623408
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/mpd/Manifest                       |   1 -
 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 -------------------------
 4 files changed, 364 deletions(-)

diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 058f3e36a46..3e72942f5c3 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,3 +1,2 @@
-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

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 cd03ebe1685..00000000000
--- 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 <fsfs@××××××.org>
-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 <string.h>
- #include <assert.h>
- 
--#ifdef ENABLE_SYSTEMD_DAEMON
-+#ifdef ENABLE_SYSTEMD
- #include <systemd/sd-daemon.h>
- #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 44d02733ce2..f2736f902a3 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -17,7 +17,6 @@
     <flag name="faad">Use external faad library for AAC decoding</flag>
     <flag name="fifo">Support writing audio to a FIFO</flag>
     <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (discouraged)</flag>
-    <flag name="glib">Enable GLib usage</flag>
     <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
     <flag name="id3tag">Support for ID3 tags</flag>
     <flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>

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 2c72863763a..00000000000
--- 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="!<sys-cluster/mpich2-1.4_rc2
-	adplug? ( media-libs/adplug )
-	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-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 )
-	glib? ( dev-libs/glib:2 )
-	gme? ( >=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[smbclient] >=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
-}