old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index a629b082f5f9ad92bcab8502b747ab151507a136..cd384fe1334b325cff508ebf1b4a377814bfda2f 100644 (file)
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,8 +1,4 @@
-AUX cmus-2.2.0-new-ffmpeg.patch 395 RMD160 dc96f1b0f7cd44d16ca8cfda6f5ec9ceb8f62a8b SHA1 d4cb8d41e374cdd06c57172567afac9c13436a55 SHA256 613ff226ed5eaf74ad0314cb7032bc64221b7588bd16d831fbcd709a701a8ca5
-AUX cmus-2.2.0-symlink_attack.patch 458 RMD160 996b40375989082ea1fa49dcb11ef0f5b0f1eab8 SHA1 17146ed5b903f2aa31dd463c662695a5b9f9a76a SHA256 3cd685ccf3f9dd4005fa611aa29c950d11a93af37ba7df3d26beb4cf46fe5f75
-DIST cmus-2.2.0.tar.bz2 155448 RMD160 1287666c16332ad34222461e29d8355ef607e7b5 SHA1 a6472633ac55660eb3aec5d2ae0296da86903bb2 SHA256 f18ffafc7161a383ddc79b34cc16a5a38f675454c49799dac5d172bf22d12005
 DIST cmus-v2.3.2.tar.bz2 167078 RMD160 bef8227ce02cb3c2c09e6014246a784ae4b3f5fc SHA1 fdfb96f0c53373475ecd05139ebfcb3fd4613a18 SHA256 27d7d17e00945e70c14e33f9d46608e0ba7fee0513b2714feec157e46f90ca46
-EBUILD cmus-2.2.0-r2.ebuild 2514 RMD160 83b80f786bd084ff26591acc5832a7e8368dd016 SHA1 54d4abdb51e883bf5ff1fb7d09e5763cc15d9e56 SHA256 96b22bae0f58cc7c05d80366ab76c7c5aaf37af7ee42e4c19afc40d14058a08f
 EBUILD cmus-2.3.2.ebuild 2361 RMD160 5526393072b88d089ff3d8130797cbf54728c994 SHA1 67d6f5275ee3e6899217783b64e228a858a33f65 SHA256 ac694f7d379b2ce7233a9dd8daaa65a0b507c49dfd04f18f2c146ad2d8e3e85e
 MISC ChangeLog 5702 RMD160 c8932962ae4201cb32181034eb674c210c525822 SHA1 490a0f647889de6b8453cd47e7fb1f4b047eb7a1 SHA256 f192e4cc733d90986aae47c863213117e59aa2ae96a49ed7accf5382f66a3d82
 MISC metadata.xml 393 RMD160 c267194299466d8685e762e14ad84e41a48accc6 SHA1 3b0b7bdc883c25319b866d768b80027032ec2cdd SHA256 c23322916957a25e9d0e817556ceca1aab4d87cfb7f972e264d391e46d9c504e

diff --git a/media-sound/cmus/cmus-2.2.0-r2.ebuild b/media-sound/cmus/cmus-2.2.0-r2.ebuild
deleted file mode 100644 (file)
index 147f297..0000000
--- a/media-sound/cmus/cmus-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.2.0-r2.ebuild,v 1.5 2009/12/04 10:32:54 ssuominen Exp $
-
-EAPI=2
-inherit eutils multilib
-
-DESCRIPTION="A ncurses based music player with plugin support for many formats"
-HOMEPAGE="http://cmus.sourceforge.net/"
-SRC_URI="http://mirror.greaterscope.net/cmus/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="aac alsa ao debug examples flac mad mikmod modplug mp4 oss pidgin unicode
-vorbis wavpack wma zsh-completion"
-
-DEPEND="sys-libs/ncurses[unicode?]
-       aac? ( media-libs/faad2 )
-       alsa? ( >=media-libs/alsa-lib-1.0.11 )
-       ao? (  media-libs/libao )
-       flac? ( media-libs/flac )
-       mad? ( >=media-libs/libmad-0.14 )
-       mikmod? ( media-libs/libmikmod )
-       modplug? ( >=media-libs/libmodplug-0.7 )
-       mp4? ( >=media-libs/libmp4v2-1.9 )
-       vorbis? ( >=media-libs/libvorbis-1.0 )
-       wavpack? ( media-sound/wavpack )
-       wma? ( >=media-video/ffmpeg-0.4.9_p20080326 )"
-RDEPEND="${DEPEND}
-       zsh-completion? ( app-shells/zsh )
-       pidgin? ( net-im/pidgin
-               dev-python/dbus-python )"
-
-my_config() {
-       local value
-       use ${1} && value=y || value=n
-       myconf="${myconf} ${2}=${value}"
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-new-ffmpeg.patch \
-               "${FILESDIR}"/${P}-symlink_attack.patch
-
-       sed -i -e 's:<mp4.h>:<mp4v2/mp4v2.h>:' mp4.c || die
-}
-
-src_configure() {
-       local debuglevel=1 myconf="CONFIG_SUN=n CONFIG_MPC=n"
-
-       use debug && debuglevel=2
-
-       my_config aac CONFIG_AAC
-       my_config ao CONFIG_AO
-       my_config alsa CONFIG_ALSA
-       my_config flac CONFIG_FLAC
-       my_config mad CONFIG_MAD
-       my_config mikmod CONFIG_MIKMOD
-       my_config mp4 CONFIG_MP4
-       my_config modplug CONFIG_MODPLUG
-       my_config oss CONFIG_OSS
-       my_config vorbis CONFIG_VORBIS
-       my_config wavpack CONFIG_WAVPACK
-       my_config wma CONFIG_FFMPEG
-
-       # econf doesn't work, because configure wants "prefix" (and similar) without dashes
-       ./configure prefix=/usr ${myconf} exampledir=/usr/share/doc/${PF}/examples \
-               libdir=/usr/$(get_libdir) DEBUG=${debuglevel} || die "configure failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc AUTHORS README
-       use examples || rm -rf "${D}/usr/share/doc/${PF}/examples/"
-
-       if use zsh-completion; then
-               insinto /usr/share/zsh/site-functions
-               doins contrib/_cmus
-       fi
-
-       if use pidgin; then
-               sed -i -e "s:/usr/local/bin/python:/usr/bin/python:" contrib/cmus-updatepidgin.py
-               newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
-       fi
-}

diff --git a/media-sound/cmus/files/cmus-2.2.0-new-ffmpeg.patch b/media-sound/cmus/files/cmus-2.2.0-new-ffmpeg.patch
deleted file mode 100644 (file)
index 89812b2..0000000
--- a/media-sound/cmus/files/cmus-2.2.0-new-ffmpeg.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- cmus-2.2.0-orig/ffmpeg.c   2007-07-27 16:52:13.000000000 +0200
-+++ cmus-2.2.0/ffmpeg.c        2008-04-25 16:32:40.000000000 +0200
-@@ -18,9 +18,9 @@
-  */
- 
- #include <stdio.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avio.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavformat/avio.h>
- 
- #include "ip.h"
- #include "xmalloc.h"

diff --git a/media-sound/cmus/files/cmus-2.2.0-symlink_attack.patch b/media-sound/cmus/files/cmus-2.2.0-symlink_attack.patch
deleted file mode 100644 (file)
index 3c3e09c..0000000
--- a/media-sound/cmus/files/cmus-2.2.0-symlink_attack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur cmus-2.2.0.orig/cmus-status-display cmus-2.2.0/cmus-status-display
---- cmus-2.2.0.orig/cmus-status-display        2007-07-27 17:52:13.000000000 +0300
-+++ cmus-2.2.0/cmus-status-display     2009-05-12 09:12:56.000000000 +0300
-@@ -19,7 +19,7 @@
- output()
- {
-       # write status to /tmp/cmus-status (not very useful though)
--      echo "$*" >> /tmp/cmus-status 2>&1
-+      echo "$*" >> ~/.cmus-status 2>&1
- 
-       # WMI (http://wmi.modprobe.de/)
-       #wmiremote -t "$*" &> /dev/null