commit: 2745c28539dbb1462bafee5657d8c82e84e9d998
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 08:09:25 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 08:15:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2745c285
media-sound/cmus: drop old versions
Package-Manager: portage-2.2.28
media-sound/cmus/Manifest | 2 -
media-sound/cmus/cmus-2.5.0-r1.ebuild | 97 -------------------
media-sound/cmus/cmus-2.6.0.ebuild | 104 ---------------------
...2.5.0-cdio-make-it-work-with-libcdio-0.90.patch | 100 --------------------
4 files changed, 303 deletions(-)
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index b1e9c0f..2536ea6 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,3 +1 @@
-DIST cmus-2.6.0.tar.gz 287834 SHA256
0c53c072432e026d682d1749bbe89777507b31107ca04afad21a9bf375208e8e SHA512
737ee38886f449aa67b105e170aaa3ef3f7f5dff9be079ff92817e9f249f4e0a88e78a190e8a0ccae1c6be8a11fa954df5b59592472bbb795c36197d2b377dd8
WHIRLPOOL
e8a2504424cf059934352e769b9e8ede05e559ed12eba81b02a78007ac7e87231a58c113e7f26f0e6f091d6a048d2979c0169dfe21d543b3d70647a21219b17a
DIST cmus-2.7.1.tar.gz 296818 SHA256
8179a7a843d257ddb585f4c65599844bc0e516fe85e97f6f87a7ceade4eb5165 SHA512
b29ce10bbb61eb41c33c4912be320718fcf005a5797320145b124f048f6be5f5b0cebb67471ef7b062bd6f854849b6aae0e82e9adbf289a44237787932ea1576
WHIRLPOOL
a6ee2109f5f6b6e771704fc1887fe1caf988bff39126d1a7a26d8fb93a7dfe53113eee697a04cb2bbaf4c274b9acbb9a5ecbf2d1c0e3fac4552380a23f5f3549
-DIST cmus-v2.5.0.tar.bz2 224675 SHA256
2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf SHA512
a43e976dd7ca39d576ae51b0f66f9bc4fa21f30626cb814fa237389c9bbc1c0b5a3a28b1d3d0d86527c3a3ffb771cc68d29d5ca8b88f0390bda7926e668504e4
WHIRLPOOL
44baaf57e0e572736f7d2ed2fa1f16c6712831c1e10de5ef26a142f7b366547fa39212e5f947fbba6401212c9ffd41f208f4cbc457d9d9ac9f08282fbedbeb3c
diff --git a/media-sound/cmus/cmus-2.5.0-r1.ebuild
b/media-sound/cmus/cmus-2.5.0-r1.ebuild
deleted file mode 100644
index 51d3ee1..0000000
--- a/media-sound/cmus/cmus-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib
-
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="A ncurses based music player with plugin support for many formats"
-HOMEPAGE="http://cmus.sourceforge.net/";
-SRC_URI="mirror://sourceforge/cmus/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="aac alsa ao cue cdio cddb discid debug examples flac +mad mikmod modplug
mp4 musepack oss pidgin pulseaudio unicode vorbis wavpack wma zsh-completion"
-
-CDEPEND="sys-libs/ncurses[unicode?]
- aac? ( media-libs/faad2 )
- alsa? ( >=media-libs/alsa-lib-1.0.11 )
- ao? ( media-libs/libao )
- cue? ( media-libs/libcue )
- cdio? ( dev-libs/libcdio-paranoia )
- cddb? ( media-libs/libcddb )
- discid? ( media-libs/libdiscid )
- flac? ( media-libs/flac )
- mad? ( >=media-libs/libmad-0.14 )
- mikmod? ( media-libs/libmikmod:0 )
- modplug? ( >=media-libs/libmodplug-0.7 )
- mp4? ( >=media-libs/libmp4v2-1.9:0 )
- musepack? ( >=media-sound/musepack-tools-444 )
- pulseaudio? ( media-sound/pulseaudio )
- vorbis? ( >=media-libs/libvorbis-1.0 )
- wavpack? ( media-sound/wavpack )
- wma? ( >=virtual/ffmpeg-0.10.2-r1 )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- zsh-completion? ( app-shells/zsh )
- pidgin? ( net-im/pidgin
- dev-python/dbus-python )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-cdio-make-it-work-with-libcdio-0.90.patch
#452446
-}
-
-my_config() {
- local value
- use ${1} && value=a || value=n
- myconf="${myconf} ${2}=${value}"
-}
-
-src_configure() {
- local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n"
-
- use debug && debuglevel=2
-
- my_config cue CONFIG_CUE
- my_config cddb CONFIG_CDDB
- my_config cdio CONFIG_CDIO
- my_config discid CONFIG_DISCID
- my_config flac CONFIG_FLAC
- my_config mad CONFIG_MAD
- my_config modplug CONFIG_MODPLUG
- my_config mikmod CONFIG_MIKMOD
- my_config musepack CONFIG_MPC
- my_config vorbis CONFIG_VORBIS
- my_config wavpack CONFIG_WAVPACK
- my_config mp4 CONFIG_MP4
- my_config aac CONFIG_AAC
- my_config wma CONFIG_FFMPEG
- my_config pulseaudio CONFIG_PULSE
- my_config alsa CONFIG_ALSA
- my_config ao CONFIG_AO
- my_config oss CONFIG_OSS
-
- ./configure prefix="${EPREFIX}"/usr ${myconf}
exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
- libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_install() {
- default
-
- use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
-
- if use zsh-completion; then
- insinto /usr/share/zsh/site-functions
- doins contrib/_cmus
- fi
-
- if use pidgin; then
- newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
- fi
-}
diff --git a/media-sound/cmus/cmus-2.6.0.ebuild
b/media-sound/cmus/cmus-2.6.0.ebuild
deleted file mode 100644
index 371bfdb..0000000
--- a/media-sound/cmus/cmus-2.6.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit multilib
-
-DESCRIPTION="A ncurses based music player with plugin support for many formats"
-HOMEPAGE="http://cmus.github.io/";
-SRC_URI="https://github.com/cmus/cmus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="aac alsa ao cue cdio cddb discid debug examples flac jack libsamplerate
+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor unicode
vorbis wavpack wma zsh-completion"
-
-CDEPEND="sys-libs/ncurses[unicode?]
- aac? ( media-libs/faad2 )
- alsa? ( >=media-libs/alsa-lib-1.0.11 )
- ao? ( media-libs/libao )
- cue? ( media-libs/libcue )
- cdio? ( dev-libs/libcdio-paranoia )
- cddb? ( media-libs/libcddb )
- discid? ( media-libs/libdiscid )
- flac? ( media-libs/flac )
- jack? ( media-sound/jack-audio-connection-kit )
- libsamplerate? ( media-libs/libsamplerate )
- mad? ( >=media-libs/libmad-0.14 )
- mikmod? ( media-libs/libmikmod:0 )
- modplug? ( >=media-libs/libmodplug-0.7 )
- mp4? ( >=media-libs/libmp4v2-1.9:0 )
- musepack? ( >=media-sound/musepack-tools-444 )
- opus? ( media-libs/opusfile )
- pulseaudio? ( media-sound/pulseaudio )
- tremor? ( media-libs/tremor )
- !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
- wavpack? ( media-sound/wavpack )
- wma? ( >=virtual/ffmpeg-0.10.2-r1 )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- zsh-completion? ( app-shells/zsh )
- pidgin? ( net-im/pidgin dev-python/dbus-python )"
-
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs
instead of vorbis libs
-REQUIRED_USE="tremor? ( vorbis )"
-
-DOCS="AUTHORS README.md"
-
-# TODO: What is CONFIG_ROAR and why it's missing from Portage?
-# TODO: If CONFIG_ROAR is unhandled, has someone skipped other new
dependencies as well?
-
-my_config() {
- local value
- use ${1} && value=a || value=n
- myconf="${myconf} ${2}=${value}"
-}
-
-src_configure() {
- local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n"
-
- use debug && debuglevel=2
-
- my_config cue CONFIG_CUE
- my_config cddb CONFIG_CDDB
- my_config cdio CONFIG_CDIO
- my_config discid CONFIG_DISCID
- my_config flac CONFIG_FLAC
- my_config mad CONFIG_MAD
- my_config modplug CONFIG_MODPLUG
- my_config mikmod CONFIG_MIKMOD
- my_config musepack CONFIG_MPC
- my_config vorbis CONFIG_VORBIS
- my_config tremor CONFIG_TREMOR
- my_config opus CONFIG_OPUS
- my_config wavpack CONFIG_WAVPACK
- my_config mp4 CONFIG_MP4
- my_config aac CONFIG_AAC
- my_config wma CONFIG_FFMPEG
- my_config pulseaudio CONFIG_PULSE
- my_config alsa CONFIG_ALSA
- my_config jack CONFIG_JACK
- my_config libsamplerate CONFIG_SAMPLERATE
- my_config ao CONFIG_AO
- my_config oss CONFIG_OSS
-
- ./configure prefix="${EPREFIX}"/usr ${myconf}
exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
- libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_install() {
- default
-
- use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
-
- if use zsh-completion; then
- insinto /usr/share/zsh/site-functions
- doins contrib/_cmus
- fi
-
- if use pidgin; then
- newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
- fi
-}
diff --git
a/media-sound/cmus/files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch
b/media-sound/cmus/files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch
deleted file mode 100644
index ace57bf..0000000
---
a/media-sound/cmus/files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 70c727022dcfd802de0d621255ab1a366a50c434 Mon Sep 17 00:00:00 2001
-From: Gregory Petrosyan <[email protected]>
-Date: Mon, 28 Jan 2013 16:13:40 +0400
-Subject: [PATCH] cdio: make it work with libcdio 0.90+
-
-Signed-off-by: Gregory Petrosyan <[email protected]>
----
- cdio.c | 47 ++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 38 insertions(+), 9 deletions(-)
-
-diff --git a/cdio.c b/cdio.c
-index b88983a..b248b3a 100644
---- a/cdio.c
-+++ b/cdio.c
-@@ -27,9 +27,14 @@
- #include "comment.h"
- #include "discid.h"
-
--#include <cdio/cdda.h>
- #include <cdio/cdio.h>
- #include <cdio/logging.h>
-+#if LIBCDIO_VERSION_NUM >= 90
-+#include <cdio/paranoia/cdda.h>
-+#else
-+#include <cdio/cdda.h>
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -352,24 +357,47 @@ static int libcdio_read_comments(struct
input_plugin_data *ip_data, struct keyva
- GROWING_KEYVALS(c);
- const char *artist = NULL, *albumartist = NULL, *album = NULL,
- *title = NULL, *genre = NULL, *comment = NULL;
-- const cdtext_t *cdtext_track, *cdtext_album;
-+ int track_comments_found = 0;
-+ const cdtext_t *cdt;
- #ifdef HAVE_CDDB
- cddb_conn_t *cddb_conn = NULL;
- cddb_disc_t *cddb_disc = NULL;
- #endif
- char buf[64];
-
-- cdtext_track = cdio_get_cdtext(priv->cdio, priv->track);
-- if (cdtext_track) {
-- char * const *field = cdtext_track->field;
-+#if LIBCDIO_VERSION_NUM >= 90
-+ cdt = cdio_get_cdtext(priv->cdio);
-+ if (cdt) {
-+ artist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, priv->track);
-+ title = cdtext_get(cdt, CDTEXT_FIELD_TITLE, priv->track);
-+ genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, priv->track);
-+ comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, priv->track);
-+
-+ if (title)
-+ track_comments_found = 1;
-+
-+ album = cdtext_get(cdt, CDTEXT_FIELD_TITLE, 0);
-+ albumartist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, 0);
-+ if (!artist)
-+ artist = albumartist;
-+ if (!genre)
-+ genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, 0);
-+ if (!comment)
-+ comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, 0);
-+ }
-+#else
-+ cdt = cdio_get_cdtext(priv->cdio, priv->track);
-+ if (cdt) {
-+ track_comments_found = 1;
-+ char * const *field = cdt->field;
- artist = field[CDTEXT_PERFORMER];
- title = field[CDTEXT_TITLE];
- genre = field[CDTEXT_GENRE];
- comment = field[CDTEXT_MESSAGE];
- }
-- cdtext_album = cdio_get_cdtext(priv->cdio, 0);
-- if (cdtext_album) {
-- char * const *field = cdtext_album->field;
-+ cdt = cdio_get_cdtext(priv->cdio, 0);
-+ if (cdt) {
-+ char * const *field = cdt->field;
- album = field[CDTEXT_TITLE];
- albumartist = field[CDTEXT_PERFORMER];
- if (!artist)
-@@ -379,9 +407,10 @@ static int libcdio_read_comments(struct input_plugin_data
*ip_data, struct keyva
- if (!comment)
- comment = field[CDTEXT_MESSAGE];
- }
-+#endif
-
- #ifdef HAVE_CDDB
-- if (!cdtext_track && cddb_url && cddb_url[0]) {
-+ if (!track_comments_found && cddb_url && cddb_url[0]) {
- cddb_track_t *cddb_track;
- track_t i_tracks = cdio_get_num_tracks(priv->cdio);
- track_t i_first_track = cdio_get_first_track_num(priv->cdio);
---
-1.8.2.1
-
