commit: 53edb22502fda72873aea92137d705792999d776 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Apr 16 07:35:49 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Apr 16 07:36:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53edb225
media-sound/forked-daapd: Remove last-rited pkg Closes: https://bugs.gentoo.org/680800 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-sound/forked-daapd/Manifest | 1 - media-sound/forked-daapd/files/antlr-3.5.patch | 81 ---------------------- media-sound/forked-daapd/files/daapd.confd | 11 --- media-sound/forked-daapd/files/daapd.initd | 31 --------- .../files/forked-daapd-23.2-fix-arg-enable.patch | 57 --------------- .../forked-daapd/forked-daapd-23.2-r1.ebuild | 81 ---------------------- media-sound/forked-daapd/metadata.xml | 20 ------ profiles/package.mask | 7 -- 8 files changed, 289 deletions(-) diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest deleted file mode 100644 index 30b31053591..00000000000 --- a/media-sound/forked-daapd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST forked-daapd-23.2.tar.gz 325895 BLAKE2B 31fd3362ed3a46721aec7b48efafb2fd77a4bb549362ee1717e2166409ce0f24a65c5ea95d4278860cb0e3ad717bcdaf7c3a744678dc591263f5cd4c4a965991 SHA512 11b5c6c16c0c9e20f1c196941cd09602d90b5e2ed0765e4fac25c6aeba388706bd7ede9f6c467227c245f2597466e8658f9db75073ee8b47b16f947514eb1511 diff --git a/media-sound/forked-daapd/files/antlr-3.5.patch b/media-sound/forked-daapd/files/antlr-3.5.patch deleted file mode 100644 index 86461f3f0ba..00000000000 --- a/media-sound/forked-daapd/files/antlr-3.5.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 7cf35d1e8bb8dedb710e4a60bada2739d60306d0 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <[email protected]> -Date: Mon, 5 Oct 2015 23:10:45 +0100 -Subject: [PATCH 1/2] Allow ANTLR 3.5 to work - -This involves a harmless backwards-compatible adjustment to the -grammar. I can't explain why this is necessary but this might help. - -http://stackoverflow.com/questions/20057063/follow-set-in-is-undefined-in-generated-parser ---- - src/RSP.g | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/src/RSP.g b/src/RSP.g -index 435de16..6a27536 100644 ---- a/src/RSP.g -+++ b/src/RSP.g -@@ -43,43 +43,43 @@ strcrit : FIELD strop STR -> ^(strop FIELD STR) - | FIELD NOT strop STR -> ^(NOT ^(strop FIELD STR)) - ; - --strop : EQUAL -- | INCLUDES -- | STARTSW -- | ENDSW -+strop : equal=EQUAL -+ | includes=INCLUDES -+ | startsw=STARTSW -+ | endsw=ENDSW - ; - - intcrit : FIELD intop INT -> ^(intop FIELD INT) - | FIELD NOT intop INT -> ^(NOT ^(intop FIELD INT)) - ; - --intop : EQUAL -- | LESS -- | GREATER -- | LTE -- | GTE -+intop : equal=EQUAL -+ | less=LESS -+ | greater=GREATER -+ | lte=LTE -+ | gte=GTE - ; - - datecrit: FIELD dateop datespec -> ^(dateop FIELD datespec) - ; - --dateop : BEFORE -- | AFTER -+dateop : before=BEFORE -+ | after=AFTER - ; - - datespec: dateref - | INT dateintval dateop dateref -> ^(dateop dateref INT dateintval) - ; - --dateref : DATE -- | TODAY -+dateref : date=DATE -+ | today=TODAY - ; - - dateintval -- : DAY -- | WEEK -- | MONTH -- | YEAR -+ : day=DAY -+ | week=WEEK -+ | month=MONTH -+ | year=YEAR - ; - - QUOTE : '"'; --- -2.4.3 - diff --git a/media-sound/forked-daapd/files/daapd.confd b/media-sound/forked-daapd/files/daapd.confd deleted file mode 100644 index 8b268509861..00000000000 --- a/media-sound/forked-daapd/files/daapd.confd +++ /dev/null @@ -1,11 +0,0 @@ -# Set the log level (0-5) -#LOG_LEVEL=2 - -# Specify the log domains. Comma-separated, choose from: config, -# daap, db, httpd, main, mdns, misc, rsp, scan, xcode, event, remote, -# dacp, ffmpeg, artwork, player, raop, laudio, dmap, dbperf, spotify, -# lastfm, cache -#LOG_DOMAINS=main,config - -# ffid to be broadcast in mDNS records -#FFID=homeserver diff --git a/media-sound/forked-daapd/files/daapd.initd b/media-sound/forked-daapd/files/daapd.initd deleted file mode 100644 index 7854bd4cc40..00000000000 --- a/media-sound/forked-daapd/files/daapd.initd +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/openrc-run - -# Override in /etc/conf.d/daapd -LOG_LEVEL=${LOG_LEVEL:-2} -LOG_DOMAINS=${LOG_DOMAINS:-'main,mdns,db,scan'} -FFID=${FFID:-daapd} - -PIDFILE=/var/run/forked-daapd.pid - -depend() { - need avahi-dnsconfd -} - -start() { - ebegin "Starting daapd" - start-stop-daemon --start forked-daapd \ - --pidfile "$PIDFILE" \ - -- \ - -P "$PIDFILE" \ - -d "$LOG_LEVEL" \ - -b "$FFID" \ - -D "$LOG_DOMAINS" - eend $? -} - -stop() { - ebegin "Stopping daapd" - start-stop-daemon --stop forked-daapd \ - --pidfile "$PIDFILE" - eend $? -} diff --git a/media-sound/forked-daapd/files/forked-daapd-23.2-fix-arg-enable.patch b/media-sound/forked-daapd/files/forked-daapd-23.2-fix-arg-enable.patch deleted file mode 100644 index 7c4297ef0e9..00000000000 --- a/media-sound/forked-daapd/files/forked-daapd-23.2-fix-arg-enable.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- configure.ac.orig 2015-07-20 18:03:12.270584746 -0500 -+++ configure.ac 2015-07-20 18:03:00.050585581 -0500 -@@ -51,25 +51,35 @@ - AC_SYS_LARGEFILE - AC_TYPE_OFF_T - --AC_ARG_ENABLE(flac, AS_HELP_STRING([--enable-flac], [extract FLAC metadata with libflac (default=no)]), -- use_flac=true; -- CPPFLAGS="${CPPFLAGS} -DFLAC") -- --AC_ARG_ENABLE(musepack, AS_HELP_STRING([--enable-musepack], [extract Musepack metadata with taglib (default=no)]), -- use_musepack=true; -- CPPFLAGS="${CPPFLAGS} -DMUSEPACK") -- --AC_ARG_ENABLE(itunes, AS_HELP_STRING([--enable-itunes], [enable iTunes library support (default=no)]), -- use_itunes=true; -- CPPFLAGS="${CPPFLAGS} -DITUNES") -- --AC_ARG_ENABLE(spotify, AS_HELP_STRING([--enable-spotify], [enable Spotify library support (default=no)]), -- use_spotify=true; -- CPPFLAGS="${CPPFLAGS} -DSPOTIFY") -- --AC_ARG_ENABLE(lastfm, AS_HELP_STRING([--enable-lastfm], [enable LastFM support (default=no)]), -- use_lastfm=true; -- CPPFLAGS="${CPPFLAGS} -DLASTFM") -+AC_ARG_ENABLE(flac, AS_HELP_STRING([--enable-flac], [extract FLAC metadata with libflac (default=no)])) -+AS_IF([test "x$enable_flac" = "xyes"], [ -+ use_flac=true; -+ CPPFLAGS="${CPPFLAGS} -DFLAC" -+]) -+ -+AC_ARG_ENABLE(musepack, AS_HELP_STRING([--enable-musepack], [extract Musepack metadata with taglib (default=no)])) -+AS_IF([test "x$enable_musepack" = "xyes"], [ -+ use_musepack=true; -+ CPPFLAGS="${CPPFLAGS} -DMUSEPACK" -+]) -+ -+AC_ARG_ENABLE(itunes, AS_HELP_STRING([--enable-itunes], [enable iTunes library support (default=no)])) -+AS_IF([test "x$enable_itunes" = "xyes"], [ -+ use_itunes=true; -+ CPPFLAGS="${CPPFLAGS} -DITUNES" -+]) -+ -+AC_ARG_ENABLE(spotify, AS_HELP_STRING([--enable-spotify], [enable Spotify library support (default=no)])) -+AS_IF([test "x$enable_spotify" = "xyes"], [ -+ use_spotify=true; -+ CPPFLAGS="${CPPFLAGS} -DSPOTIFY" -+]) -+ -+AC_ARG_ENABLE(lastfm, AS_HELP_STRING([--enable-lastfm], [enable LastFM support (default=no)])) -+AS_IF([test "x$enable_lastfm" = "xyes"], [ -+ use_lastfm=true; -+ CPPFLAGS="${CPPFLAGS} -DLASTFM" -+]) - - case "$host" in - *-*-linux-*) diff --git a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild deleted file mode 100644 index e38ffacba8d..00000000000 --- a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# TODO: -# Add --enable-spotify when it works - -EAPI=5 - -inherit autotools eutils user - -DESCRIPTION="A DAAP (iTunes) media server" -HOMEPAGE="https://github.com/ejurgensen/forked-daapd"; -SRC_URI="https://github.com/ejurgensen/forked-daapd/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="alsa flac itunes lastfm mpd musepack" - -# Note: mpd support appears to be standalone, e.g. --enable-mpd doesn't -# result in additional linkage. -RDEPEND=" - dev-db/sqlite:3 - dev-libs/antlr-c:0 - dev-libs/confuse - dev-libs/libevent - dev-libs/libgcrypt:0 - dev-libs/libunistring - dev-libs/mxml[threads] - media-libs/alsa-lib - net-dns/avahi[dbus] - virtual/ffmpeg - - flac? ( media-libs/flac ) - itunes? ( app-pda/libplist ) - lastfm? ( net-misc/curl ) - musepack? ( media-libs/taglib ) -" - -DEPEND=" - dev-java/antlr:3.5 - ${RDEPEND} -" - -pkg_setup() { - enewuser daapd - enewgroup daapd -} - -src_prepare() { - # Fixed in 23.3. - epatch "${FILESDIR}/${P}-fix-arg-enable.patch" - - # https://github.com/ejurgensen/forked-daapd/pull/185 - epatch "${FILESDIR}/antlr-3.5.patch" - - eautoreconf -} - -src_configure() { - ac_cv_prog_ANTLR=antlr3.5 \ - econf \ - --with-alsa \ - $(use_enable flac) \ - $(use_enable musepack) \ - $(use_enable itunes) \ - $(use_enable lastfm) \ - $(use_enable mpd) -} - -src_install() { - emake DESTDIR="${D}" install - - newinitd "${FILESDIR}/daapd.initd" daapd - newconfd "${FILESDIR}/daapd.confd" daapd - - # dodir by itself fails in the likely case of /srv/music having a - # volume mounted already. - test -d /srv/music || dodir /srv/music - - fowners -R daapd:daapd /var/lib/cache/forked-daapd -} diff --git a/media-sound/forked-daapd/metadata.xml b/media-sound/forked-daapd/metadata.xml deleted file mode 100644 index 6c5d7e30e1b..00000000000 --- a/media-sound/forked-daapd/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!--maintainer-needed--> - <longdescription> - This is a much updated version of the original - forked-daapd 0.19 (non-gcd), a Linux/FreeBSD DAAP - (iTunes) media server with support for AirPlay - devices, Apple Remote (and compatibles), Spotify and - internet radio. - </longdescription> - <use> - <flag name="itunes">Enable support for iTunes library XML</flag> - <flag name="lastfm">Enable LastFM scrobbling support</flag> - <flag name="mpd">Enable streaming to mpd</flag> - </use> - <upstream> - <remote-id type="github">ejurgensen/forked-daapd</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 6732a06549d..d686f7d4241 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -604,13 +604,6 @@ dev-util/synopsis # Masked for testing =mail-client/geary-3.32.0-r1 -# Michał Górny <[email protected]> (17 Mar 2019) -# The current Gentoo version has been added in 2015 and has not been -# bumped since. It fails to build with new versions of gperf (#609272) -# and ffmpeg (#671256). No maintainer. -# Removal in 30 days. Bug #680800. -media-sound/forked-daapd - # Matt Turner <[email protected]> (16 Mar 2019) # Previously packaged drivers, now removed from Gentoo. # Keep this mask in place so users are aware, but can also easily unmask them
