[gentoo-commits] repo/proj/prefix:master commit in: media-sound/herrie/, media-sound/herrie/files/

[Fabian Groffen]

commit:     072a89ef6db7264140ed1e021ebff44d58965550
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 12:05:30 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 12:05:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=072a89ef

media-sound/herrie: drop the noise from Prefix

EAPI=2 is long abandoned, sorry kito

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 media-sound/herrie/Manifest                       |   1 -
 media-sound/herrie/files/herrie-2.2-libxspf.patch | 122 ----------------------
 media-sound/herrie/files/herrie-chost_issue.patch |  29 -----
 media-sound/herrie/herrie-2.2.ebuild              |  72 -------------
 media-sound/herrie/metadata.xml                   |  27 -----
 5 files changed, 251 deletions(-)

diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
deleted file mode 100644
index 60caebbb1c..0000000000
--- a/media-sound/herrie/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST herrie-2.2.tar.bz2 71596 BLAKE2B 7065711dea83c1ff3bb2ede9b155f032f463dc8f51657adcfc1b46076a241cd9bcb62a80284de93b076b3ab9419a4cac01a9edbb8f76f1b07565b20c93e2c3a8 SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213

diff --git a/media-sound/herrie/files/herrie-2.2-libxspf.patch b/media-sound/herrie/files/herrie-2.2-libxspf.patch
deleted file mode 100644
index 00dc3057b2..0000000000
--- a/media-sound/herrie/files/herrie-2.2-libxspf.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- configure
-+++ configure
-@@ -301,7 +301,7 @@ fi
- if [ "$CFG_XSPF" != "" ]
- then
- 	CFLAGS="$CFLAGS -DBUILD_XSPF"
--	LDFLAGS="$LDFLAGS -lspiff"
-+	test_pkgconfig "libxspf" "xspf" "_vfs_xspf"
- 	SRCS="$SRCS util vfs_xspf"
- 	PLAYQ_DUMPFILE="autosave.xspf"
- else
---- src/conftest.c
-+++ src/conftest.c
-@@ -56,16 +56,10 @@
- #include <vorbis/codec.h>
- #include <vorbis/vorbisfile.h>
- #endif /* BUILD_VORBIS */
--#ifdef BUILD_XSPF
--#include <spiff/spiff_c.h>
--#endif /* BUILD_XSPF */
- 
- int
- main(int argc, char *argv[])
- {
--#ifdef BUILD_XSPF
--	spiff_write(NULL, NULL, NULL);
--#endif /* BUILD_XSPF */
- 
- 	return (0);
- }
---- src/vfs_xspf.c
-+++ src/vfs_xspf.c
-@@ -30,7 +30,7 @@
- 
- #include "stdinc.h"
- 
--#include <spiff/spiff_c.h>
-+#include <xspf_c.h>
- 
- #include "util.h"
- #include "vfs.h"
-@@ -50,22 +50,22 @@ vfs_xspf_match(struct vfsent *ve, int isdir)
- int
- vfs_xspf_populate(struct vfsent *ve)
- {
--	struct spiff_list *slist;
--	struct spiff_track *strack;
--	struct spiff_mvalue *sloc;
-+	struct xspf_list *slist;
-+	struct xspf_track *strack;
-+	struct xspf_mvalue *sloc;
- 	char *dirname, *baseuri, *filename;
- 	struct vfsref *vr;
- 
- 	baseuri = url_escape(ve->filename);
--	slist = spiff_parse(ve->filename, baseuri);
-+	slist = xspf_parse(ve->filename, baseuri);
- 	g_free(baseuri);
- 	if (slist == NULL)
- 		return (-1);
- 
- 	dirname = g_path_get_dirname(ve->filename);
- 
--	SPIFF_LIST_FOREACH_TRACK(slist, strack) {
--		SPIFF_TRACK_FOREACH_LOCATION(strack, sloc) {
-+	XSPF_LIST_FOREACH_TRACK(slist, strack) {
-+		XSPF_TRACK_FOREACH_LOCATION(strack, sloc) {
- 			/* Skip file:// part */
- 			filename = url_unescape(sloc->value);
- 
-@@ -77,40 +77,40 @@ vfs_xspf_populate(struct vfsent *ve)
- 	}
- 	
- 	g_free(dirname);
--	spiff_free(slist);
-+	xspf_free(slist);
- 	return (0);
- }
- 
- int
- vfs_xspf_write(const struct vfslist *vl, const char *filename)
- {
--	struct spiff_list *list;
--	struct spiff_track *track;
--	struct spiff_mvalue *location;
-+	struct xspf_list *list;
-+	struct xspf_track *track;
-+	struct xspf_mvalue *location;
- 	char *fn, *baseuri;
- 	struct vfsref *vr;
- 	int ret;
- 
--	list = spiff_new();
-+	list = xspf_new();
- 
- 	VFS_LIST_FOREACH_REVERSE(vl, vr) {
- 		/* Add a new track to the beginning of the list */
--		track = spiff_new_track_before(&list->tracks);
-+		track = xspf_new_track_before(&list->tracks);
- 
- 		/* Make sure we don't write non-UTF-8 titles to disk */
- 		if (g_utf8_validate(vfs_name(vr), -1, NULL))
--			spiff_setvalue(&track->title, vfs_name(vr));
-+			xspf_setvalue(&track->title, vfs_name(vr));
- 
--		location = spiff_new_mvalue_before(&track->locations);
-+		location = xspf_new_mvalue_before(&track->locations);
- 		fn = url_escape(vfs_filename(vr));
--		spiff_setvalue(&location->value, fn);
-+		xspf_setvalue(&location->value, fn);
- 		g_free(fn);
- 	}
- 
- 	baseuri = url_escape(filename);
--	ret = spiff_write(list, filename, baseuri);
-+	ret = xspf_write(list, filename, baseuri);
- 	g_free(baseuri);
--	spiff_free(list);
-+	xspf_free(list);
- 
- 	return (ret);
- }

diff --git a/media-sound/herrie/files/herrie-chost_issue.patch b/media-sound/herrie/files/herrie-chost_issue.patch
deleted file mode 100644
index 1949972baa..0000000000
--- a/media-sound/herrie/files/herrie-chost_issue.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-This patch sets the OS variable according to the CHOST given by the environment,
-thus enabling cross-compilation.
-
-Index: herrie-1.8/configure
-===================================================================
---- herrie-1.8.orig/configure
-+++ herrie-1.8/configure
-@@ -50,6 +50,21 @@ CFG_VORBIS=yes
- CFG_XSPF=yes
- DOIT=@
- 
-+case "$CHOST" in
-+  *-darwin*)
-+	OS=Darwin
-+	;;
-+  *-linux*)
-+	OS=Linux
-+	;;
-+  *-freebsd*)
-+	OS=FreeBSD
-+	;;
-+  *-solaris*)
-+	OS=SunOS
-+	;;
-+esac
-+
- # Operating system defaults
- [ "$OS" != "" ] || OS=`uname`
- case $OS in

diff --git a/media-sound/herrie/herrie-2.2.ebuild b/media-sound/herrie/herrie-2.2.ebuild
deleted file mode 100644
index c20ba1cf63..0000000000
--- a/media-sound/herrie/herrie-2.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/herrie/herrie-2.2.ebuild,v 1.8 2012/07/29 18:39:29 armin76 Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Herrie is a command line music player."
-HOMEPAGE="http://herrie.info/"
-SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls coreaudio"
-
-APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
-for X in ${APP_LINGUAS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="sys-libs/ncurses[unicode?]
-	>=dev-libs/glib-2:2
-	ao? ( media-libs/libao )
-	alsa? ( media-libs/alsa-lib )
-	http? ( net-misc/curl )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad
-		media-libs/libid3tag )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	vorbis? ( media-libs/libvorbis )
-	xspf? ( >=media-libs/libxspf-1.2 )
-	!ao? ( !alsa? ( !pulseaudio? ( !oss? ( !coreaudio? ( media-libs/alsa-lib ) ) ) ) )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-chost_issue.patch \
-		"${FILESDIR}"/${P}-libxspf.patch
-}
-
-src_configure() {
-	if ! use ao && ! use alsa && ! use pulseaudio && ! use oss && ! use coreaudio ; then
-		ewarn "No audio output selected (ao, alsa, pulseaudio, oss), defaulting to alsa."
-	fi
-
-	local EXTRA_CONF="verbose no_strip"
-	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
-	use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"
-	use coreaudio && EXTRA_CONF="${EXTRA_CONF} coreaudio"
-	use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler"
-	use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
-	use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
-	use nls || EXTRA_CONF="${EXTRA_CONF} no_nls"
-	use oss && EXTRA_CONF="${EXTRA_CONF} oss"
-	use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse"
-	use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
-	use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses"
-	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
-	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
-
-	einfo "./configure ${EXTRA_CONF}"
-	CC="$(tc-getCC)" PREFIX="${EPREFIX}"/usr MANDIR="${EPREFIX}"/usr/share/man \
-		./configure ${EXTRA_CONF} || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README
-}

diff --git a/media-sound/herrie/metadata.xml b/media-sound/herrie/metadata.xml
deleted file mode 100644
index 1f60fffd95..0000000000
--- a/media-sound/herrie/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sound@g.o</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <longdescription lang="en">
-		Herrie is a minimalistic music player that uses the command
-		line. It is written to support a variety of operating systems,
-		audio subsystems and file formats, including playlists.
-
-		Herrie has a split-screen user interface, with a playlist at
-		the top of the screen and a file browser at the bottom. When
-		tracks are added to the playlist, Herrie consumes them from the
-		top one by one. It is thus an application that allows you to
-		batch music for playback.
-
-		Herrie also has some more exotic features, including support
-		for AudioScrobbler and the ability to chroot() itself
-		into a directory.
-	</longdescription>
-  <use>
-    <flag name="http">Enable http streaming</flag>
-    <flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
-  </use>
-</pkgmetadata>